jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qol: attachments newest to oldest and adjustments so attachments are shown

Browse Source
This commit is contained in:
Gary Sharp
2024-12-18 20:09:10 +11:00
parent 7550e0e45d
commit 39ba206831
20 changed files with 81 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
+2 -2
View File
@@ -27,7 +27,7 @@
<div class="attachmentOutput">
@if (Model.Device.DeviceAttachments != null)
{
foreach (var da in Model.Device.DeviceAttachments)
foreach (var da in Model.Device.DeviceAttachments.OrderByDescending(a => a.Id))
{
<a href="@Url.Action(MVC.API.Device.AttachmentDownload(da.Id))" data-attachmentid="@da.Id" data-mimetype="@da.MimeType">
<span class="icon" title="@da.Filename">
@@ -159,7 +159,7 @@
e.find('.remove').click(removeAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
$attachmentOutput.prepend(e);
onUpdate();
if (!quick)
e.show('slow');
Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
+17 -17
View File
@@ -135,7 +135,7 @@ WriteLiteral(">\r\n");
#line 28 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
if (Model.Device.DeviceAttachments != null)
{
foreach (var da in Model.Device.DeviceAttachments)
foreach (var da in Model.Device.DeviceAttachments.OrderByDescending(a => a.Id))
{
@@ -143,14 +143,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 1553), Tuple.Create("\"", 1613)
WriteAttribute("href", Tuple.Create(" href=\"", 1582), Tuple.Create("\"", 1642)
#line 32 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1560), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentDownload(da.Id))
, Tuple.Create(Tuple.Create("", 1589), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentDownload(da.Id))
#line default
#line hidden
, 1560), false)
, 1589), false)
);
WriteLiteral(" data-attachmentid=\"");
@@ -179,42 +179,42 @@ WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"icon\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1723), Tuple.Create("\"", 1743)
WriteAttribute("title", Tuple.Create(" title=\"", 1752), Tuple.Create("\"", 1772)
#line 33 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1731), Tuple.Create<System.Object, System.Int32>(da.Filename
, Tuple.Create(Tuple.Create("", 1760), Tuple.Create<System.Object, System.Int32>(da.Filename
#line default
#line hidden
, 1731), false)
, 1760), false)
);
WriteLiteral(">\r\n <img");
WriteLiteral(" alt=\"Attachment Thumbnail\"");
WriteAttribute("src", Tuple.Create(" src=\"", 1814), Tuple.Create("\"", 1876)
WriteAttribute("src", Tuple.Create(" src=\"", 1843), Tuple.Create("\"", 1905)
#line 34 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1820), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentThumbnail(da.Id))
, Tuple.Create(Tuple.Create("", 1849), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Device.AttachmentThumbnail(da.Id))
#line default
#line hidden
, 1820), false)
, 1849), false)
);
WriteLiteral(" /></span>\r\n <span");
WriteLiteral(" class=\"comments\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1943), Tuple.Create("\"", 1980)
WriteAttribute("title", Tuple.Create(" title=\"", 1972), Tuple.Create("\"", 2009)
#line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1951), Tuple.Create<System.Object, System.Int32>(da.Comments ?? da.Filename
, Tuple.Create(Tuple.Create("", 1980), Tuple.Create<System.Object, System.Int32>(da.Comments ?? da.Filename
#line default
#line hidden
, 1951), false)
, 1980), false)
);
WriteLiteral(">\r\n");
@@ -298,14 +298,14 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2671), Tuple.Create("\"", 2709)
WriteAttribute("title", Tuple.Create(" title=\"", 2700), Tuple.Create("\"", 2738)
#line 41 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2679), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 2708), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
#line default
#line hidden
, 2679), false)
, 2708), false)
);
WriteLiteral(" data-livestamp=\"");
@@ -571,7 +571,7 @@ WriteLiteral(@"/' + a.Id);
e.find('.remove').click(removeAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
$attachmentOutput.prepend(e);
onUpdate();
if (!quick)
e.show('slow');
Disco.Web/Views/Job/JobParts/Resources.cshtml
+2 -2
View File
@@ -59,7 +59,7 @@
<h2>Drop Attachments Here</h2>
</div>
<div class="attachmentOutput">
@foreach (var ja in Model.Job.JobAttachments)
@foreach (var ja in Model.Job.JobAttachments.OrderByDescending(a => a.Id))
{
<a href="@Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))" data-attachmentid="@ja.Id" data-mimetype="@ja.MimeType">
<span class="icon" title="@ja.Filename">
@@ -462,7 +462,7 @@
e.find('.remove').click(removeLocalAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
$attachmentOutput.prepend(e);
document.DiscoFunctions.liveAfterUpdate();
if (!quick)
e.show('slow');
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+17 -17
View File
@@ -374,7 +374,7 @@ WriteLiteral(">\r\n");
#line hidden
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
foreach (var ja in Model.Job.JobAttachments)
foreach (var ja in Model.Job.JobAttachments.OrderByDescending(a => a.Id))
{
@@ -382,14 +382,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 3528), Tuple.Create("\"", 3585)
WriteAttribute("href", Tuple.Create(" href=\"", 3557), Tuple.Create("\"", 3614)
#line 64 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3535), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
, Tuple.Create(Tuple.Create("", 3564), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
#line default
#line hidden
, 3535), false)
, 3564), false)
);
WriteLiteral(" data-attachmentid=\"");
@@ -418,28 +418,28 @@ WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"icon\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3695), Tuple.Create("\"", 3715)
WriteAttribute("title", Tuple.Create(" title=\"", 3724), Tuple.Create("\"", 3744)
#line 65 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3703), Tuple.Create<System.Object, System.Int32>(ja.Filename
, Tuple.Create(Tuple.Create("", 3732), Tuple.Create<System.Object, System.Int32>(ja.Filename
#line default
#line hidden
, 3703), false)
, 3732), false)
);
WriteLiteral(">\r\n <img");
WriteLiteral(" alt=\"Attachment Thumbnail\"");
WriteAttribute("src", Tuple.Create(" src=\"", 3786), Tuple.Create("\"", 3845)
WriteAttribute("src", Tuple.Create(" src=\"", 3815), Tuple.Create("\"", 3874)
#line 66 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3792), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
, Tuple.Create(Tuple.Create("", 3821), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
#line default
#line hidden
, 3792), false)
, 3821), false)
);
WriteLiteral(" />\r\n </span>\r\n <sp" +
@@ -447,14 +447,14 @@ WriteLiteral(" />\r\n </span>\r\n
WriteLiteral(" class=\"comments\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3946), Tuple.Create("\"", 3966)
WriteAttribute("title", Tuple.Create(" title=\"", 3975), Tuple.Create("\"", 3995)
#line 68 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3954), Tuple.Create<System.Object, System.Int32>(ja.Comments
, Tuple.Create(Tuple.Create("", 3983), Tuple.Create<System.Object, System.Int32>(ja.Comments
#line default
#line hidden
, 3954), false)
, 3983), false)
);
WriteLiteral(">\r\n");
@@ -549,14 +549,14 @@ WriteLiteral(" data-livestamp=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("title", Tuple.Create(" title=\"", 4651), Tuple.Create("\"", 4689)
WriteAttribute("title", Tuple.Create(" title=\"", 4680), Tuple.Create("\"", 4718)
#line 74 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 4659), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 4688), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
#line default
#line hidden
, 4659), false)
, 4688), false)
);
WriteLiteral(">");
@@ -1271,7 +1271,7 @@ WriteLiteral(@"/' + a.Id);
e.find('.remove').click(removeLocalAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
$attachmentOutput.prepend(e);
document.DiscoFunctions.liveAfterUpdate();
if (!quick)
e.show('slow');
Disco.Web/Views/User/UserParts/_Resources.cshtml
+2 -2
View File
@@ -27,7 +27,7 @@
<div class="attachmentOutput">
@if (Model.User.UserAttachments != null)
{
foreach (var ua in Model.User.UserAttachments)
foreach (var ua in Model.User.UserAttachments.OrderByDescending(a => a.Id))
{
<a href="@Url.Action(MVC.API.User.AttachmentDownload(ua.Id))" data-attachmentid="@ua.Id" data-mimetype="@ua.MimeType">
<span class="icon" title="@ua.Filename">
@@ -157,7 +157,7 @@
e.find('.remove').click(removeAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
$attachmentOutput.prepend(e);
onUpdate();
if (!quick)
e.show('slow');
Disco.Web/Views/User/UserParts/_Resources.generated.cs
+17 -17
View File
@@ -135,7 +135,7 @@ WriteLiteral(">\r\n");
#line 28 "..\..\Views\User\UserParts\_Resources.cshtml"
if (Model.User.UserAttachments != null)
{
foreach (var ua in Model.User.UserAttachments)
foreach (var ua in Model.User.UserAttachments.OrderByDescending(a => a.Id))
{
@@ -143,14 +143,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 1523), Tuple.Create("\"", 1581)
WriteAttribute("href", Tuple.Create(" href=\"", 1552), Tuple.Create("\"", 1610)
#line 32 "..\..\Views\User\UserParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1530), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentDownload(ua.Id))
, Tuple.Create(Tuple.Create("", 1559), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentDownload(ua.Id))
#line default
#line hidden
, 1530), false)
, 1559), false)
);
WriteLiteral(" data-attachmentid=\"");
@@ -179,28 +179,28 @@ WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"icon\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1695), Tuple.Create("\"", 1715)
WriteAttribute("title", Tuple.Create(" title=\"", 1724), Tuple.Create("\"", 1744)
#line 33 "..\..\Views\User\UserParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1703), Tuple.Create<System.Object, System.Int32>(ua.Filename
, Tuple.Create(Tuple.Create("", 1732), Tuple.Create<System.Object, System.Int32>(ua.Filename
#line default
#line hidden
, 1703), false)
, 1732), false)
);
WriteLiteral(">\r\n <img");
WriteLiteral(" alt=\"Attachment Thumbnail\"");
WriteAttribute("src", Tuple.Create(" src=\"", 1790), Tuple.Create("\"", 1850)
WriteAttribute("src", Tuple.Create(" src=\"", 1819), Tuple.Create("\"", 1879)
#line 34 "..\..\Views\User\UserParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1796), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentThumbnail(ua.Id))
, Tuple.Create(Tuple.Create("", 1825), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.User.AttachmentThumbnail(ua.Id))
#line default
#line hidden
, 1796), false)
, 1825), false)
);
WriteLiteral(" />\r\n </span>\r\n " +
@@ -208,14 +208,14 @@ WriteLiteral(" />\r\n </span>\r\n
WriteLiteral(" class=\"comments\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1959), Tuple.Create("\"", 1979)
WriteAttribute("title", Tuple.Create(" title=\"", 1988), Tuple.Create("\"", 2008)
#line 36 "..\..\Views\User\UserParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1967), Tuple.Create<System.Object, System.Int32>(ua.Comments
, Tuple.Create(Tuple.Create("", 1996), Tuple.Create<System.Object, System.Int32>(ua.Comments
#line default
#line hidden
, 1967), false)
, 1996), false)
);
WriteLiteral(">\r\n");
@@ -310,14 +310,14 @@ WriteLiteral(" data-livestamp=\"");
#line hidden
WriteLiteral("\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2688), Tuple.Create("\"", 2726)
WriteAttribute("title", Tuple.Create(" title=\"", 2717), Tuple.Create("\"", 2755)
#line 42 "..\..\Views\User\UserParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2696), Tuple.Create<System.Object, System.Int32>(ua.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 2725), Tuple.Create<System.Object, System.Int32>(ua.Timestamp.ToFullDateTime()
#line default
#line hidden
, 2696), false)
, 2725), false)
);
WriteLiteral(">");
@@ -569,7 +569,7 @@ WriteLiteral(@"/' + a.Id);
e.find('.remove').click(removeAttachment);
if (!quick)
e.hide();
$attachmentOutput.append(e);
$attachmentOutput.prepend(e);
onUpdate();
if (!quick)
e.show('slow');