Skip to content

Commit 6a2065b

Browse files
committed
Surveys: Run admin screen instance list should display the 'issued on' value of the instance
#CTCTOWALTZ-2744 #6440
1 parent cf08128 commit 6a2065b

2 files changed

Lines changed: 24 additions & 3 deletions

File tree

waltz-ng/client/survey/components/survey-run-overview.html

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,13 @@
3333
</div>
3434
<br>
3535
<div class="row">
36-
<div class="col-sm-2 waltz-display-field-label">
37-
Description
36+
<div class="col-sm-2">
37+
<div class="waltz-display-field-label">
38+
Run Description
39+
</div>
40+
<div class="small help-block">
41+
Default description
42+
</div>
3843
</div>
3944
<div class="col-sm-10">
4045
<waltz-markdown text="$ctrl.run.description">
@@ -45,7 +50,10 @@
4550
<br>
4651
<div class="row">
4752
<div class="col-sm-2 waltz-display-field-label">
48-
Submission Due
53+
Run Submission Due Date
54+
<div class="small help-block">
55+
Default submission due date, can be overriden by instances
56+
</div>
4957
</div>
5058
<div class="col-sm-4">
5159
<waltz-editable-field on-save="$ctrl.updateDueDate"
@@ -56,6 +64,9 @@
5664
</div>
5765
<div class="col-sm-2 waltz-display-field-label">
5866
Approval Due
67+
<div class="small help-block">
68+
Default approval due date, can be overriden by instances
69+
</div>
5970
</div>
6071
<div class="col-sm-4">
6172
<waltz-editable-field on-save="$ctrl.updateApprovalDueDate"

waltz-ng/client/survey/survey-run-view.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ const columnDefs = [
4747
cellFilter: "toDisplayName:'surveyInstanceStatus'"
4848
}, {
4949
field: "dueDate",
50+
name: "Submission Due",
51+
cellTemplate: `
52+
<div class="ui-grid-cell-contents">
53+
<waltz-from-now timestamp="COL_FIELD"
54+
days-only="true">
55+
</waltz-from-now>
56+
</div>`
57+
}, {
58+
field: "approvalDueDate",
59+
name: "Approval Due",
5060
cellTemplate: `
5161
<div class="ui-grid-cell-contents">
5262
<waltz-from-now timestamp="COL_FIELD"

0 commit comments

Comments
 (0)