Skip to content

Commit 52c1144

Browse files
dedywahyudidedywahyudi
committed
fix: late deliverables edit
1 parent c8d4324 commit 52c1144

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

‎web/css/reskin-or/reskin.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,7 @@ td.resourcesTable__empty {
15901590
.saveChanges__cancel,
15911591
.saveChanges__save,
15921592
.lateDeliverables__search,
1593-
.lateDeliverables__cancel,
1593+
.lateDeliverables__clear,
15941594
.contactManager__submit,
15951595
.contactManager__cancel {
15961596
font-family: 'Roboto';
@@ -1614,7 +1614,7 @@ td.resourcesTable__empty {
16141614
.editProjectLink__add,
16151615
.saveChanges__cancel,
16161616
.saveChanges__save,
1617-
.lateDeliverables__cancel,
1617+
.lateDeliverables__clear,
16181618
.contactManager__cancel {
16191619
background: var(--tc-white);
16201620
border: 2px solid var(--turq-160);

‎web/i/reskin/chevron-down.svg

Lines changed: 1 addition & 1 deletion
Loading

‎web/i/reskin/chevron-up.svg

Lines changed: 1 addition & 1 deletion
Loading

‎web/js/or/late_deliverable_search.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,11 @@ function clearForm(thisForm) {
374374
var elements = thisForm.elements;
375375

376376
for (i = 0; i < elements.length; i++) {
377+
var reset_value = elements[i].getAttribute("data-reset");
378+
if(reset_value != null) {
379+
elements[i].value = reset_value;
380+
continue;
381+
}
377382
var field_type = elements[i].type.toLowerCase();
378383

379384
switch (field_type) {

‎web/jsp/viewLateDeliverables.jsp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141

142142
<div class="lateDeliverables__row">
143143
<div class="lateDeliverables__input">
144-
<input type="hidden" name="project_categories">
144+
<input type="hidden" name="project_categories" data-reset="0">
145145
<div class="lateDeliverables__selection">
146146
<div class="custom-select-wrapper">
147147
<div class="custom-select">
@@ -163,7 +163,7 @@
163163
</div>
164164

165165
<div class="lateDeliverables__input">
166-
<input type="hidden" name="project_statuses">
166+
<input type="hidden" name="project_statuses" data-reset="0">
167167
<div class="lateDeliverables__selection">
168168
<div class="custom-select-wrapper">
169169
<div class="custom-select">
@@ -185,7 +185,7 @@
185185
</div>
186186

187187
<div class="lateDeliverables__input">
188-
<input type="hidden" name="deliverable_types">
188+
<input type="hidden" name="deliverable_types" data-reset="0">
189189
<div class="lateDeliverables__selection">
190190
<div class="custom-select-wrapper">
191191
<div class="custom-select">
@@ -211,20 +211,20 @@
211211
<label for="project_id"><or:text key="viewLateDeliverables.ProjectID.Label" /></label>
212212
<input type="text" name="project_id" id="project_id" class="inputBox"
213213
onfocus="this.value = getTextValueOnFocus(this, true);"
214-
onblur="this.value = getTextValueOnFocus(this, false);" value="<or:fieldvalue field='project_id' />" />
214+
onblur="this.value = getTextValueOnFocus(this, false);" value="<or:fieldvalue field='project_id' />" data-reset="" />
215215
<div id="project_id_serverside_validation" class="error"><s:fielderror escape="false"><s:param>project_id</s:param></s:fielderror></div>
216216
</div>
217217

218218
<div class="lateDeliverables__input lateDeliverables__inputText">
219219
<label for="handle"><or:text key="viewLateDeliverables.LateMemberHandle.Label" /></label>
220220
<input type="text" name="handle" id="handle" class="inputBox"
221221
onfocus="this.value = getTextValueOnFocus(this, true);"
222-
onblur="this.value = getTextValueOnFocus(this, false);" value="<or:fieldvalue field='handle' />" />
222+
onblur="this.value = getTextValueOnFocus(this, false);" value="<or:fieldvalue field='handle' />" data-reset="" />
223223
<div id="handle_serverside_validation" class="error"><s:fielderror escape="false"><s:param>handle</s:param></s:fielderror></div>
224224
</div>
225225

226226
<div class="lateDeliverables__input">
227-
<input type="hidden" name="justified">
227+
<input type="hidden" name="justified" data-reset="Any">
228228
<div class="lateDeliverables__selection">
229229
<div class="custom-select-wrapper">
230230
<div class="custom-select">
@@ -253,7 +253,7 @@
253253
<div class="lateDeliverables__advancedBody" <c:if test="${not requestScope.hasAnyAdvancedSearchParameter}">style="display:none"</c:if>>
254254
<div class="lateDeliverables__row">
255255
<div class="lateDeliverables__input">
256-
<input type="hidden" name="tcd_project_id">
256+
<input type="hidden" name="tcd_project_id" data-reset="">
257257
<div class="lateDeliverables__selection">
258258
<div class="custom-select-wrapper">
259259
<div class="custom-select">
@@ -275,7 +275,7 @@
275275
</div>
276276

277277
<div class="lateDeliverables__input">
278-
<input type="hidden" name="explanation_status">
278+
<input type="hidden" name="explanation_status" data-reset="">
279279
<div class="lateDeliverables__selection">
280280
<div class="custom-select-wrapper">
281281
<div class="custom-select">
@@ -295,7 +295,7 @@
295295
</div>
296296

297297
<div class="lateDeliverables__input">
298-
<input type="hidden" name="response_status">
298+
<input type="hidden" name="response_status" data-reset="">
299299
<div class="lateDeliverables__selection">
300300
<div class="custom-select-wrapper">
301301
<div class="custom-select">
@@ -321,7 +321,7 @@
321321
<input type="text" name="min_deadline"
322322
class="inputBoxDate" id="min_deadline"
323323
onfocus="this.value = getDateValueOnFocus(this, true);"
324-
onblur="this.value = getDateValueOnFocus(this, false);" value="<or:fieldvalue field='min_deadline' />" />
324+
onblur="this.value = getDateValueOnFocus(this, false);" value="<or:fieldvalue field='min_deadline' />" data-reset="" />
325325
<div id="min_deadline_validation_msg" style="display:none;" class="error"></div>
326326
</div>
327327

@@ -330,14 +330,14 @@
330330
<input type="text" name="max_deadline"
331331
class="inputBoxDate" id="max_deadline"
332332
onfocus="this.value = getDateValueOnFocus(this, true);"
333-
onblur="this.value = getDateValueOnFocus(this, false);" value="<or:fieldvalue field='max_deadline' />" />
333+
onblur="this.value = getDateValueOnFocus(this, false);" value="<or:fieldvalue field='max_deadline' />" data-reset="" />
334334
<div id="max_deadline_validation_msg" style="display:none;" class="error"></div>
335335
<div id="deadline_serverside_validation" class="error">
336336
<s:fielderror escape="false"><s:param>max_deadline</s:param></s:fielderror></div>
337337
</div>
338338

339339
<div class="lateDeliverables__input">
340-
<input type="hidden" name="late_deliverable_type">
340+
<input type="hidden" name="late_deliverable_type" data-reset="">
341341
<div class="lateDeliverables__selection">
342342
<div class="custom-select-wrapper">
343343
<div class="custom-select">
@@ -364,7 +364,7 @@
364364
<div class="divider"></div>
365365

366366
<div class="lateDeliverables__button">
367-
<button class="lateDeliverables__cancel" onclick="submitForm=false;"><or:text key='btnCancel.alt' /></button>
367+
<button class="lateDeliverables__clear" onclick="submitForm=false;"><or:text key='btnClear.alt' /></button>
368368
<button class="lateDeliverables__search" onclick="submitForm=true;"><or:text key='btnSearch.alt' /></button>
369369
</div>
370370

0 commit comments

Comments
 (0)