feat: egress in line + the date now shows properly on tre ui (#495)

SwanseaUniversityMedical · Dec 19, 2023 · e3f681e · e3f681e
1 parent ec3e03e
commit e3f681e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Data-Egress-UI/Views/Data/GetEgress.cshtml b/src/Data-Egress-UI/Views/Data/GetEgress.cshtml
@@ -43,9 +43,9 @@
                         @*@Html.LabelFor(x => x.Files[i].Name, new { @class = "form-label" })*@
 
                         <a href="@Url.Action("DownloadFile", "Data",new{FileId=@Model.Files[i].Id})" class="btn btn-link">@Html.DisplayFor(x => x.Files[i].Name, new { @class = "form-control" }) <i class="ms-2 fa fa-download"></i></a>
-                    </div>
-                    <div class="form-group">
-                        <div class="form-check form-check-inline">
+                   @* </div>*@
+@*                    <div class="form-group">
+*@                        <div class="form-check form-check-inline">
                             @Html.RadioButtonFor(x => x.Files[i].Status, FileStatus.Approved, new { @class = "form-check-input"})
                             @Html.Label(FileStatus.Approved.ToString())
                         </div>

diff --git a/src/TRE-UI/Views/Approval/EditProject.cshtml b/src/TRE-UI/Views/Approval/EditProject.cshtml
@@ -59,8 +59,12 @@
                     <h2 class="fs-5 mt-5">Project Expiry Date</h2>
                     <p>The date the project expires.</p>
 
+
                     <div id ="date" class="form-group">
-                        @Html.TextBoxFor(x => x.ProjectExpiryDate, new { @class = "form-control", @placeholder = "kindly input date", @type = "date", @Value = Model.ProjectExpiryDate})
+                        @Html.TextBoxFor(x => x.ProjectExpiryDate, new { @class = "form-control", @Value=Model.ProjectExpiryDate.ToString("yyyy-MM-dd"), type = "date"});
+                        <script>
+                            document.getElementById("ProjectExpiryDate").valueAsDate = new Date("@Model.ProjectExpiryDate.ToString("yyyy-MM-dd")");
+                        </script>
 
                     </div>
                     <h2 class="fs-5 mt-5">Decision</h2>