Skip to content

fix: #172 Create-time-entries-manually #221

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
enriquezrene merged 4 commits into from
May 12, 2020
Merged

fix: #172 Create-time-entries-manually #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb1a20c
fix: #172 Create-time-entries-manually
DiegoTinitana May 7, 2020
b3c016d
fix: #172 Create-time-entries-manually
DiegoTinitana May 7, 2020
26038ac
fix: #172 removing old styles
enriquezrene May 8, 2020
2dbb0f9
fix: #172 Create-time-entries-manually fix view
DiegoTinitana May 11, 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
5 changes: 5 additions & 0 deletions package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"bootstrap": "^4.4.1",
"jquery": "^3.5.0",
"minimist": "^1.2.5",
"moment": "^2.25.3",
"msal": "^1.2.1",
"ngx-pagination": "^5.0.0",
"ngx-toastr": "^12.0.1",
Expand Down
164 changes: 107 additions & 57 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,11 +1,14 @@
<form [formGroup]="entryForm" (ngSubmit)="onSubmit()">
<div *ngIf="formType === 'entries'" class="input-group input-group-sm mb-3 flex-nowrap">
<div>
<div class="input-group input-group-sm mb-3 flex-nowrap">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Project</span>
</div>
<div class="ng-autocomplete">
<ng-autocomplete
class="autocomplete"
name="projectName"
ngDefaultControl
[(ngModel)]="projectName"
[data]="listProjects && listProjects"
[searchKeyword]="keyword"
[itemTemplate]="itemTemplate"
Expand All @@ -20,66 +23,113 @@
</ng-template>
</div>
</div>
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Activity</span>
<form [formGroup]="entryForm" (ngSubmit)="onSubmit()">
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Activity</span>
</div>
<select id="activitiesSelect" class="form-control" formControlName="activity">
<option *ngFor="let activity of activities">{{ activity.name }}</option>
</select>
</div>
<select id="activitiesSelect" class="form-control">
<option *ngFor="let activity of activities">{{ activity.name }}</option>
</select>
</div>
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Jira Ticket</span>

<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Ticket</span>
</div>
<input
formControlName="uri"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>
<input
formControlName="ticket"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>

<div class="input-group input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Technology</span>
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Start/Date</span>
</div>
<input
formControlName="start_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Start/Hour</span>
</div>
<input
formControlName="start_hour"
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" id="inputGroup-sizing-sm">End/Date</span>
</div>
<input
formControlName="end_date"
type="date"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">End/Hour</span>
</div>
<input
formControlName="end_hour"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Technology</span>
</div>
<input
(keypress)="getTechnologies($event.target.value)"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>
<input
(keypress)="getTechnologies($event.target.value)"
type="text"
class="form-control"
aria-label="Small"
aria-describedby="inputGroup-sizing-sm"
/>
</div>

<div *ngIf="isLoading">LOADING...</div>
<div #list *ngIf="technology && showlist" class="d-flex flex-column technology-content">
<div
*ngFor="let item of technology.items"
(click)="setTechnology(item.name)"
class="technology-list"
[ngClass]="{ active: selectedTechnology.includes(item.name) }"
>
{{ item.name }}
<div *ngIf="isLoading">LOADING...</div>
<div #list *ngIf="technology && showlist" class="d-flex flex-column technology-content">
<div
*ngFor="let item of technology.items"
(click)="setTechnology(item.name)"
class="technology-list"
[ngClass]="{ active: selectedTechnology.includes(item.name) }"
>
{{ item.name }}
</div>
</div>
</div>
<div class="tags-content d-flex flex-wrap">
<div *ngFor="let technology of selectedTechnology; let tagIndex = index" class="tag">
<span class="mr-3">{{ technology }}</span>
<i class="fas fa-times text-white" (click)="removeTag(tagIndex)"></i>
<div class="tags-content d-flex flex-wrap">
<div *ngFor="let technology of selectedTechnology; let tagIndex = index" class="tag">
<span class="mr-3">{{ technology }}</span>
<i class="fas fa-times text-white" (click)="removeTag(tagIndex)"></i>
</div>
</div>
</div>

<div class="form-group text-left">
<label for="NotesTextarea">Notes</label>
<textarea formControlName="comments" class="form-control" id="NotesTextarea" rows="3"></textarea>
</div>
<div [ngClass]="{ hidden: formType !== 'entries' }" class="modal-footer">
<button #closeModal type="button" class="btn close-button-style" data-dismiss="modal">
Close
</button>
<button type="submit" class="btn save-button-style">Save changes</button>
</div>
</form>
<div class="form-group text-left">
<label for="NotesTextarea">Description</label>
<textarea formControlName="description" class="form-control" id="NotesTextarea" rows="3"></textarea>
</div>
<div [ngClass]="{ hidden: formType !== 'entries' }" class="modal-footer">
<button #closeModal type="button" class="btn btn-secondary" data-dismiss="modal">
Close
</button>
<button type="submit" class="btn btn-primary">Save changes</button>
</div>
</form>
</div>
31 changes: 21 additions & 10 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 @@ -19,16 +19,6 @@
display: none;
}

.save-button-style {
background-color: $modal-button-primary;
color: white;
}

.close-button-style {
background-color: $modal-button-secondary;
color: white;
}

.technology-content {
box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.08);
margin: 0 0 2rem 6rem;
Expand Down Expand Up @@ -89,3 +79,24 @@
}
}
}

input[type="date"]::-webkit-calendar-picker-indicator {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
width: auto;
height: auto;
color: transparent;
background: transparent;
-webkit-appearance: none;
}

input[type="date"]::-webkit-inner-spin-button {
-webkit-appearance: none;
}

input[type="date"]::-webkit-clear-button {
z-index: 1;
}
Loading