Skip to content

Commit 4a5727c

Browse files
enriquezreneenriquezrene
authored
Merge pull request #221 from ioet/172-Create-time-entries-manually
fix: #172 Create-time-entries-manually
2 parents d77328c + 2dbb0f9 commit 4a5727c

22 files changed

+698
-250
lines changed

‎package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"bootstrap": "^4.4.1",
2828
"jquery": "^3.5.0",
2929
"minimist": "^1.2.5",
30+
"moment": "^2.25.3",
3031
"msal": "^1.2.1",
3132
"ngx-pagination": "^5.0.0",
3233
"ngx-toastr": "^12.0.1",

‎src/app/modules/shared/components/details-fields/details-fields.component.html

Lines changed: 107 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
<form [formGroup]="entryForm" (ngSubmit)="onSubmit()">
2-
<div *ngIf="formType === 'entries'" class="input-group input-group-sm mb-3 flex-nowrap">
1+
<div>
2+
<div class="input-group input-group-sm mb-3 flex-nowrap">
33
<div class="input-group-prepend">
44
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Project</span>
55
</div>
66
<div class="ng-autocomplete">
77
<ng-autocomplete
88
class="autocomplete"
9+
name="projectName"
10+
ngDefaultControl
11+
[(ngModel)]="projectName"
912
[data]="listProjects && listProjects"
1013
[searchKeyword]="keyword"
1114
[itemTemplate]="itemTemplate"
@@ -20,66 +23,113 @@
2023
</ng-template>
2124
</div>
2225
</div>
23-
<div class="input-group input-group-sm mb-3">
24-
<div class="input-group-prepend">
25-
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Activity</span>
26+
<form [formGroup]="entryForm" (ngSubmit)="onSubmit()">
27+
<div class="input-group input-group-sm mb-3">
28+
<div class="input-group-prepend">
29+
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Activity</span>
30+
</div>
31+
<select id="activitiesSelect" class="form-control" formControlName="activity">
32+
<option *ngFor="let activity of activities">{{ activity.name }}</option>
33+
</select>
2634
</div>
27-
<select id="activitiesSelect" class="form-control">
28-
<option *ngFor="let activity of activities">{{ activity.name }}</option>
29-
</select>
30-
</div>
31-
<div class="input-group input-group-sm mb-3">
32-
<div class="input-group-prepend">
33-
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Jira Ticket</span>
35+
36+
<div class="input-group input-group-sm mb-3">
37+
<div class="input-group-prepend">
38+
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Ticket</span>
39+
</div>
40+
<input
41+
formControlName="uri"
42+
type="text"
43+
class="form-control"
44+
aria-label="Small"
45+
aria-describedby="inputGroup-sizing-sm"
46+
/>
3447
</div>
35-
<input
36-
formControlName="ticket"
37-
type="text"
38-
class="form-control"
39-
aria-label="Small"
40-
aria-describedby="inputGroup-sizing-sm"
41-
/>
42-
</div>
4348

44-
<div class="input-group input-group-sm">
45-
<div class="input-group-prepend">
46-
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Technology</span>
49+
<div class="input-group input-group-sm mb-3">
50+
<div class="input-group-prepend">
51+
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Start/Date</span>
52+
</div>
53+
<input
54+
formControlName="start_date"
55+
type="date"
56+
class="form-control"
57+
aria-label="Small"
58+
aria-describedby="inputGroup-sizing-sm"
59+
/>
60+
<div class="input-group-prepend">
61+
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Start/Hour</span>
62+
</div>
63+
<input
64+
formControlName="start_hour"
65+
type="text"
66+
class="form-control"
67+
aria-label="Small"
68+
aria-describedby="inputGroup-sizing-sm"
69+
/>
70+
</div>
71+
<div class="input-group input-group-sm mb-3">
72+
<div class="input-group-prepend">
73+
<span class="input-group-text span-width" id="inputGroup-sizing-sm">End/Date</span>
74+
</div>
75+
<input
76+
formControlName="end_date"
77+
type="date"
78+
class="form-control"
79+
aria-label="Small"
80+
aria-describedby="inputGroup-sizing-sm"
81+
/>
82+
<div class="input-group-prepend">
83+
<span class="input-group-text span-width" id="inputGroup-sizing-sm">End/Hour</span>
84+
</div>
85+
<input
86+
formControlName="end_hour"
87+
type="text"
88+
class="form-control"
89+
aria-label="Small"
90+
aria-describedby="inputGroup-sizing-sm"
91+
/>
92+
</div>
93+
<div class="input-group input-group-sm">
94+
<div class="input-group-prepend">
95+
<span class="input-group-text span-width" id="inputGroup-sizing-sm">Technology</span>
96+
</div>
97+
<input
98+
(keypress)="getTechnologies($event.target.value)"
99+
type="text"
100+
class="form-control"
101+
aria-label="Small"
102+
aria-describedby="inputGroup-sizing-sm"
103+
/>
47104
</div>
48-
<input
49-
(keypress)="getTechnologies($event.target.value)"
50-
type="text"
51-
class="form-control"
52-
aria-label="Small"
53-
aria-describedby="inputGroup-sizing-sm"
54-
/>
55-
</div>
56105

57-
<div *ngIf="isLoading">LOADING...</div>
58-
<div #list *ngIf="technology && showlist" class="d-flex flex-column technology-content">
59-
<div
60-
*ngFor="let item of technology.items"
61-
(click)="setTechnology(item.name)"
62-
class="technology-list"
63-
[ngClass]="{ active: selectedTechnology.includes(item.name) }"
64-
>
65-
{{ item.name }}
106+
<div *ngIf="isLoading">LOADING...</div>
107+
<div #list *ngIf="technology && showlist" class="d-flex flex-column technology-content">
108+
<div
109+
*ngFor="let item of technology.items"
110+
(click)="setTechnology(item.name)"
111+
class="technology-list"
112+
[ngClass]="{ active: selectedTechnology.includes(item.name) }"
113+
>
114+
{{ item.name }}
115+
</div>
66116
</div>
67-
</div>
68-
<div class="tags-content d-flex flex-wrap">
69-
<div *ngFor="let technology of selectedTechnology; let tagIndex = index" class="tag">
70-
<span class="mr-3">{{ technology }}</span>
71-
<i class="fas fa-times text-white" (click)="removeTag(tagIndex)"></i>
117+
<div class="tags-content d-flex flex-wrap">
118+
<div *ngFor="let technology of selectedTechnology; let tagIndex = index" class="tag">
119+
<span class="mr-3">{{ technology }}</span>
120+
<i class="fas fa-times text-white" (click)="removeTag(tagIndex)"></i>
121+
</div>
72122
</div>
73-
</div>
74123

75-
<div class="form-group text-left">
76-
<label for="NotesTextarea">Notes</label>
77-
<textarea formControlName="comments" class="form-control" id="NotesTextarea" rows="3"></textarea>
78-
</div>
79-
<div [ngClass]="{ hidden: formType !== 'entries' }" class="modal-footer">
80-
<button #closeModal type="button" class="btn close-button-style" data-dismiss="modal">
81-
Close
82-
</button>
83-
<button type="submit" class="btn save-button-style">Save changes</button>
84-
</div>
85-
</form>
124+
<div class="form-group text-left">
125+
<label for="NotesTextarea">Description</label>
126+
<textarea formControlName="description" class="form-control" id="NotesTextarea" rows="3"></textarea>
127+
</div>
128+
<div [ngClass]="{ hidden: formType !== 'entries' }" class="modal-footer">
129+
<button #closeModal type="button" class="btn btn-secondary" data-dismiss="modal">
130+
Close
131+
</button>
132+
<button type="submit" class="btn btn-primary">Save changes</button>
133+
</div>
134+
</form>
135+
</div>

‎src/app/modules/shared/components/details-fields/details-fields.component.scss

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@
1919
display: none;
2020
}
2121

22-
.save-button-style {
23-
background-color: $modal-button-primary;
24-
color: white;
25-
}
26-
27-
.close-button-style {
28-
background-color: $modal-button-secondary;
29-
color: white;
30-
}
31-
3222
.technology-content {
3323
box-shadow: 0 3px 8px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.08);
3424
margin: 0 0 2rem 6rem;
@@ -89,3 +79,24 @@
8979
}
9080
}
9181
}
82+
83+
input[type="date"]::-webkit-calendar-picker-indicator {
84+
position: absolute;
85+
top: 0;
86+
left: 0;
87+
right: 0;
88+
bottom: 0;
89+
width: auto;
90+
height: auto;
91+
color: transparent;
92+
background: transparent;
93+
-webkit-appearance: none;
94+
}
95+
96+
input[type="date"]::-webkit-inner-spin-button {
97+
-webkit-appearance: none;
98+
}
99+
100+
input[type="date"]::-webkit-clear-button {
101+
z-index: 1;
102+
}

0 commit comments

Comments
 (0)