Revize a0cbde1e
Přidáno uživatelem plundrichov před více než 4 roky(ů)
client/src/OverviewAdmin.js | ||
---|---|---|
104 | 104 |
</div> |
105 | 105 |
<div className="underline-1"></div> |
106 | 106 |
<div className="side-board-items column"> |
107 |
<table border = "0"> |
|
107 |
<table className="side-board-table" border = "0">
|
|
108 | 108 |
<tbody> |
109 | 109 |
<tr> |
110 | 110 |
<th className="th-left">Name</th> |
... | ... | |
130 | 130 |
) : ( |
131 | 131 |
employee.holiday |
132 | 132 |
)}</td> |
133 |
<td> |
|
133 | 134 |
{/* Edit Button */} |
134 | 135 |
<button onClick={(e) => editEmployee(employee.id, e)} className="btn-edit"> |
135 | 136 |
<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> |
... | ... | |
138 | 139 |
</svg> |
139 | 140 |
</button> |
140 | 141 |
{/* End of Edit Button */} |
142 |
</td> |
|
141 | 143 |
</tr> |
142 | 144 |
))} |
143 | 145 |
</tbody> |
client/src/UpcomingRequests.js | ||
---|---|---|
37 | 37 |
switch (vacationType) { |
38 | 38 |
case 'SICK_DAY' : |
39 | 39 |
return 'sickday'; |
40 |
case 'HOLIDAY':
|
|
40 |
default:
|
|
41 | 41 |
return 'holiday'; |
42 | 42 |
} |
43 | 43 |
} |
client/src/YourRequests.js | ||
---|---|---|
34 | 34 |
} |
35 | 35 |
|
36 | 36 |
function convertVacationType(vacationType) { |
37 |
// vacationType = 'SICK_DAY' ? 'sickday' : 'holiday' |
|
38 |
|
|
39 |
// if (vacationType = 'SICK_DAY') { |
|
40 |
// return: 'sickday', |
|
41 |
// } else { |
|
42 |
// return: 'holiday' |
|
43 |
// } |
|
44 |
|
|
45 | 37 |
switch (vacationType) { |
46 | 38 |
case 'SICK_DAY' : |
47 | 39 |
return 'sickday'; |
48 |
case 'HOLIDAY':
|
|
40 |
default:
|
|
49 | 41 |
return 'holiday'; |
50 | 42 |
} |
51 | 43 |
} |
client/src/api.js | ||
---|---|---|
12 | 12 |
`${http}/users/current/profile`, { |
13 | 13 |
headers: { |
14 | 14 |
Authorization: 1 |
15 |
|
|
15 | 16 |
} |
16 | 17 |
} |
17 | 18 |
); |
... | ... | |
327 | 328 |
let response; |
328 | 329 |
|
329 | 330 |
try { |
330 |
const response = await fetch(
|
|
331 |
response = await fetch( |
|
331 | 332 |
`${http}/settings`, { |
332 | 333 |
headers: { |
333 | 334 |
Authorization: 1 |
335 |
|
|
334 | 336 |
} |
335 | 337 |
}); |
336 | 338 |
} catch (e) { |
Také k dispozici: Unified diff
re #58 fetch setting(const response), switch added default opt.