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

Feature #35: Livestamp implemented

Browse Source 
Humanized dates now update automatically when a page is left open for
some time.
This commit is contained in:
Gary Sharp
2014-02-11 16:50:03 +11:00
parent c4cc54d316
commit 7bdbeb6a82
40 changed files with 1395 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Job/JobParts/Insurance.cshtml
+1 -1
View File
@@ -526,7 +526,7 @@
<script>
$(function () {
var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
var jobOpenDate = '@(Model.Job.OpenedDate.ToISO8601())';
document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Claim Form Sent Date', 'Job_JobMetaInsurance_ClaimFormSentDate', 'Job_JobMetaInsurance_ClaimFormSentUserId', 'InsuranceClaimFormSentDate', 'Not Sent', jobOpenDate, false);
});
Disco.Web/Views/Job/JobParts/Insurance.generated.cs
+2 -1
View File
@@ -29,6 +29,7 @@ namespace Disco.Web.Views.Job.JobParts
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
using Disco.Services.Web;
using Disco.Web;
@@ -1674,7 +1675,7 @@ WriteLiteral("\';\r\n var jobOpenDate = \'");
#line 529 "..\..\Views\Job\JobParts\Insurance.cshtml"
Write(Model.Job.OpenedDate.ToJavaScript());
Write(Model.Job.OpenedDate.ToISO8601());
#line default
Disco.Web/Views/Job/JobParts/NonWarrantyFinance.cshtml
+1 -1
View File
@@ -125,7 +125,7 @@
<script>
$(function () {
var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
var jobOpenDate = '@(Model.Job.OpenedDate.ToISO8601())';
@if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.AccountingChargeRequired))
{<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Accounting Charge Required', 'Job_JobMetaNonWarranty_AccountingChargeRequiredDate', 'Job_JobMetaNonWarranty_AccountingChargeRequiredUser', 'NonWarrantyAccountingChargeRequired', 'Not Required', jobOpenDate, false);</text>}
Disco.Web/Views/Job/JobParts/NonWarrantyFinance.generated.cs
+2 -1
View File
@@ -29,6 +29,7 @@ namespace Disco.Web.Views.Job.JobParts
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
using Disco.Services.Web;
using Disco.Web;
@@ -460,7 +461,7 @@ WriteLiteral("\';\r\n var jobOpenDate = \'");
#line 128 "..\..\Views\Job\JobParts\NonWarrantyFinance.cshtml"
Write(Model.Job.OpenedDate.ToJavaScript());
Write(Model.Job.OpenedDate.ToISO8601());
#line default
Disco.Web/Views/Job/JobParts/Repairs.cshtml
+1 -1
View File
@@ -81,7 +81,7 @@
<script>
$(function () {
var updateUrl = '@(Url.Action(MVC.API.Job.Update(Model.Job.Id, null)))';
var jobOpenDate = '@(Model.Job.OpenedDate.ToJavaScript())';
var jobOpenDate = '@(Model.Job.OpenedDate.ToISO8601())';
@if (Authorization.Has(Claims.Job.Properties.NonWarrantyProperties.RepairerLoggedDate))
{<text>document.DiscoFunctions.DateDialogCreateUpdater(updateUrl, 'Repairer Name', 'Job_JobMetaNonWarranty_RepairerLoggedDate', null, 'NonWarrantyRepairerLoggedDate', 'Not Logged', jobOpenDate, false);</text>}
Disco.Web/Views/Job/JobParts/Repairs.generated.cs
+2 -1
View File
@@ -29,6 +29,7 @@ namespace Disco.Web.Views.Job.JobParts
using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository;
using Disco.Services;
using Disco.Services.Authorization;
using Disco.Services.Web;
using Disco.Web;
@@ -345,7 +346,7 @@ WriteLiteral("\';\r\n var jobOpenDate = \'");
#line 84 "..\..\Views\Job\JobParts\Repairs.cshtml"
Write(Model.Job.OpenedDate.ToJavaScript());
Write(Model.Job.OpenedDate.ToISO8601());
#line default
Disco.Web/Views/Job/JobParts/Resources.cshtml
+7 -5
View File
@@ -30,7 +30,7 @@
{
<div data-logid="@jl.Id">
<span class="author">@jl.TechUser.ToString()</span>@if (canRemoveAnyLogs || (canRemoveOwnLogs && jl.TechUserId == CurrentUser.Id))
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.FromNow()</span>
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" data-livestamp="@(jl.Timestamp.ToUnixEpoc())" title="@jl.Timestamp.ToFullDateTime()">@jl.Timestamp.ToFullDateTime()</span>
<span class="comment">@jl.Comments.ToMultilineJobRefString()</span>
</div>
}
@@ -59,7 +59,7 @@
else
{ @ja.Comments }}
</span><span class="author">@ja.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && ja.TechUserId == CurrentUser.Id))
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.FromNow()</span>
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" data-livestamp="@(ja.Timestamp.ToUnixEpoc())" title="@ja.Timestamp.ToFullDateTime()">@ja.Timestamp.ToFullDateTime()</span>
</a>
}
</div>
@@ -244,7 +244,9 @@
}
function liveRemoveComment(key) {
$CommentOutput.children('div[data-logid="' + key + '"]').slideUp(300).delay(300).queue(function () {
$(this).remove();
var $this = $(this);
$this.find('.timestamp').livestamp('destroy');
$this.remove();
});
}
function addComment(c, quick, canRemove) {
@@ -256,7 +258,7 @@
var e = $(t);
e.attr('data-logid', c.Id);
e.find('.author').text(c.Author);
e.find('.timestamp').text(c.TimestampFuzzy).attr('title', c.TimestampFull);
e.find('.timestamp').text(c.TimestampFull).attr('title', c.TimestampFull).livestamp(c.TimestampUnixEpoc);
if (canRemove)
e.find('.remove').click(removePost);
var eComment = e.find('.comment').text(c.Comments);
@@ -474,7 +476,7 @@
e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
e.find('.comments').text(a.Comments);
e.find('.author').text(a.Author);
e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
e.find('.timestamp').text(a.TimestampFull).attr('title', a.TimestampFull).livestamp(a.TimestampUnixEpoc);
if (canRemove)
e.find('.remove').click(removeLocalAttachment);
if (!quick)
Disco.Web/Views/Job/JobParts/Resources.generated.cs
+121 -108
View File
@@ -194,21 +194,32 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1831), Tuple.Create("\"", 1869)
WriteLiteral(" data-livestamp=\"");
#line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1839), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
Write(jl.Timestamp.ToUnixEpoc());
#line default
#line hidden
, 1839), false)
WriteLiteral("\"");
WriteAttribute("title", Tuple.Create(" title=\"", 1877), Tuple.Create("\"", 1915)
#line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 1885), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
#line default
#line hidden
, 1885), false)
);
WriteLiteral(">");
#line 33 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(jl.Timestamp.FromNow());
Write(jl.Timestamp.ToFullDateTime());
#line default
@@ -301,14 +312,14 @@ WriteLiteral(" <td");
WriteLiteral(" id=\"Attachments\"");
WriteAttribute("class", Tuple.Create(" class=\"", 2567), Tuple.Create("\"", 2642)
WriteAttribute("class", Tuple.Create(" class=\"", 2620), Tuple.Create("\"", 2695)
#line 49 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2575), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
, Tuple.Create(Tuple.Create("", 2628), Tuple.Create<System.Object, System.Int32>(canAddAttachments ? "canAddAttachments" : "cannotAddAttachments"
#line default
#line hidden
, 2575), false)
, 2628), false)
);
WriteLiteral(">\r\n <div");
@@ -333,14 +344,14 @@ WriteLiteral(">\r\n");
#line hidden
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 2810), Tuple.Create("\"", 2867)
WriteAttribute("href", Tuple.Create(" href=\"", 2863), Tuple.Create("\"", 2920)
#line 53 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2817), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
, Tuple.Create(Tuple.Create("", 2870), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
#line default
#line hidden
, 2817), false)
, 2870), false)
);
WriteLiteral(" data-attachmentid=\"");
@@ -369,42 +380,42 @@ WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"icon\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2973), Tuple.Create("\"", 2993)
WriteAttribute("title", Tuple.Create(" title=\"", 3026), Tuple.Create("\"", 3046)
#line 54 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2981), Tuple.Create<System.Object, System.Int32>(ja.Filename
, Tuple.Create(Tuple.Create("", 3034), Tuple.Create<System.Object, System.Int32>(ja.Filename
#line default
#line hidden
, 2981), false)
, 3034), false)
);
WriteLiteral(">\r\n <img");
WriteLiteral(" alt=\"Attachment Thumbnail\"");
WriteAttribute("src", Tuple.Create(" src=\"", 3060), Tuple.Create("\"", 3119)
WriteAttribute("src", Tuple.Create(" src=\"", 3113), Tuple.Create("\"", 3172)
#line 55 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3066), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
, Tuple.Create(Tuple.Create("", 3119), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
#line default
#line hidden
, 3066), false)
, 3119), false)
);
WriteLiteral(" /></span>\r\n <span");
WriteLiteral(" class=\"comments\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3182), Tuple.Create("\"", 3202)
WriteAttribute("title", Tuple.Create(" title=\"", 3235), Tuple.Create("\"", 3255)
#line 56 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3190), Tuple.Create<System.Object, System.Int32>(ja.Comments
, Tuple.Create(Tuple.Create("", 3243), Tuple.Create<System.Object, System.Int32>(ja.Comments
#line default
#line hidden
, 3190), false)
, 3243), false)
);
WriteLiteral(">\r\n");
@@ -488,21 +499,32 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3807), Tuple.Create("\"", 3845)
WriteLiteral(" data-livestamp=\"");
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3815), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
Write(ja.Timestamp.ToUnixEpoc());
#line default
#line hidden
, 3815), false)
WriteLiteral("\"");
WriteAttribute("title", Tuple.Create(" title=\"", 3906), Tuple.Create("\"", 3944)
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
, Tuple.Create(Tuple.Create("", 3914), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
#line default
#line hidden
, 3914), false)
);
WriteLiteral(">");
#line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(ja.Timestamp.FromNow());
Write(ja.Timestamp.ToFullDateTime());
#line default
@@ -909,38 +931,29 @@ WriteLiteral("addComment(d, false, false);");
#line default
#line hidden
WriteLiteral(@"
}
},
error: function (jqXHR, textStatus, errorThrown) {
alert('Unable to load live comment ' + id + ': ' + textStatus);
}
});
}
}
function liveRemoveComment(key) {
$CommentOutput.children('div[data-logid=""' + key + '""]').slideUp(300).delay(300).queue(function () {
$(this).remove();
});
}
function addComment(c, quick, canRemove) {
var t = '<div><span class=""author"" />';
if (canRemove)
t += '<span class=""remove fa fa-times-circle"" />';
t += '<span class=""timestamp"" /><span class=""comment"" /></div>';
var e = $(t);
e.attr('data-logid', c.Id);
e.find('.author').text(c.Author);
e.find('.timestamp').text(c.TimestampFuzzy).attr('title', c.TimestampFull);
if (canRemove)
e.find('.remove').click(removePost);
var eComment = e.find('.comment').text(c.Comments);
var commentHtml = eComment.text().replace(/\r\n|\r|\n/g, '<br />');
commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href=""");
WriteLiteral("\r\n }\r\n },\r\n " +
" error: function (jqXHR, textStatus, errorThrown) {\r\n " +
" alert(\'Unable to load live comment \' + id + \': \' + textStatus);\r\n " +
" }\r\n });\r\n }\r\n }\r\n " +
" function liveRemoveComment(key) {\r\n $CommentOutput.childre" +
"n(\'div[data-logid=\"\' + key + \'\"]\').slideUp(300).delay(300).queue(function () {\r\n" +
" var $this = $(this);\r\n $this.find(\'.times" +
"tamp\').livestamp(\'destroy\');\r\n $this.remove();\r\n " +
" });\r\n }\r\n function addComment(c, quick, canRemove) {\r\n " +
" var t = \'<div><span class=\"author\" />\';\r\n if (canR" +
"emove)\r\n t += \'<span class=\"remove fa fa-times-circle\" />\';\r\n" +
" t += \'<span class=\"timestamp\" /><span class=\"comment\" /></div>\';" +
"\r\n\r\n var e = $(t);\r\n e.attr(\'data-logid\', c.Id);\r\n" +
" e.find(\'.author\').text(c.Author);\r\n e.find(\'.time" +
"stamp\').text(c.TimestampFull).attr(\'title\', c.TimestampFull).livestamp(c.Timesta" +
"mpUnixEpoc);\r\n if (canRemove)\r\n e.find(\'.remov" +
"e\').click(removePost);\r\n var eComment = e.find(\'.comment\').text(c" +
".Comments);\r\n var commentHtml = eComment.text().replace(/\\r\\n|\\r|" +
"\\n/g, \'<br />\');\r\n commentHtml = commentHtml.replace(/\\#(\\d+)/g, " +
"\'<a href=\"");
#line 264 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 266 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.Job.Show(null)));
@@ -970,14 +983,14 @@ WriteLiteral(@"?id=$1"">#$1</a>');
");
#line 285 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 287 "..\..\Views\Job\JobParts\Resources.cshtml"
}
#line default
#line hidden
#line 286 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 288 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canShowAttachments)
{
@@ -998,7 +1011,7 @@ WriteLiteral(@" <script>
var jobId = parseInt('");
#line 299 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 301 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id);
@@ -1009,13 +1022,13 @@ WriteLiteral("\');\r\n\r\n //#region Attachments\r\n var $
"tput\');\r\n\r\n");
#line 305 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 307 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default
#line hidden
#line 305 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 307 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canAddAttachments)
{
@@ -1046,7 +1059,7 @@ WriteLiteral(@"
'");
#line 328 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 330 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
@@ -1067,7 +1080,7 @@ WriteLiteral(@"',
'UploadUrl=");
#line 340 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 342 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)));
@@ -1102,7 +1115,7 @@ WriteLiteral(@"');
");
#line 366 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 368 "..\..\Views\Job\JobParts\Resources.cshtml"
}
@@ -1111,13 +1124,13 @@ WriteLiteral(@"');
WriteLiteral("\r\n");
#line 368 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 370 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default
#line hidden
#line 368 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 370 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canRemoveAnyAttachments || canRemoveOwnAttachments)
{
@@ -1152,7 +1165,7 @@ WriteLiteral(@"
url: '");
#line 395 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 397 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentRemove()));
@@ -1180,7 +1193,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
" }\r\n\r\n //#endregion\r\n\r\n ");
#line 428 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 430 "..\..\Views\Job\JobParts\Resources.cshtml"
}
@@ -1191,7 +1204,7 @@ WriteLiteral("\r\n function addAttachment(key, quick) {\r\n\r\n
" $.ajax({\r\n url: \'");
#line 436 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 438 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.Attachment()));
@@ -1203,13 +1216,13 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
"");
#line 442 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 444 "..\..\Views\Job\JobParts\Resources.cshtml"
#line default
#line hidden
#line 442 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 444 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canRemoveAnyAttachments)
{
@@ -1223,7 +1236,7 @@ WriteLiteral("buildAttachment(a, true, quick);");
WriteLiteral("\r\n");
#line 445 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 447 "..\..\Views\Job\JobParts\Resources.cshtml"
}
else if (canRemoveOwnAttachments)
{
@@ -1236,7 +1249,7 @@ WriteLiteral(" ");
WriteLiteral("buildAttachment(a, (a.AuthorId === \'");
#line 448 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 450 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(CurrentUser.Id);
@@ -1247,7 +1260,7 @@ WriteLiteral("\'), quick);");
WriteLiteral("\r\n");
#line 449 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 451 "..\..\Views\Job\JobParts\Resources.cshtml"
}
else
{
@@ -1262,7 +1275,7 @@ WriteLiteral("buildAttachment(a, false, quick);");
WriteLiteral("\r\n");
#line 453 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 455 "..\..\Views\Job\JobParts\Resources.cshtml"
}
@@ -1290,7 +1303,7 @@ WriteLiteral(@" } else {
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
#line 473 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 475 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentDownload()));
@@ -1299,7 +1312,7 @@ WriteLiteral(@" } else {
WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'");
#line 474 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 476 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
@@ -1307,39 +1320,39 @@ WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'s
#line hidden
WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.Comments);\r\n " +
" e.find(\'.author\').text(a.Author);\r\n e.find(\'.times" +
"tamp\').text(a.TimestampFuzzy).attr(\'title\', a.TimestampFull);\r\n " +
" if (canRemove)\r\n e.find(\'.remove\').click(removeLocalAt" +
"tachment);\r\n if (!quick)\r\n e.hide();\r\n" +
" $attachmentOutput.append(e);\r\n if (!quick" +
")\r\n e.show(\'slow\');\r\n if (a.MimeType.t" +
"oLowerCase().indexOf(\'image/\') == 0)\r\n e.shadowbox({ gall" +
"ery: \'attachments\', player: \'img\', title: a.Comments });\r\n }\r\n " +
" }\r\n\r\n function removeAttachment(key) {\r\n if (" +
"key.JobId == jobId) {\r\n var $element = $attachmentOutput.find" +
"(\'a[data-attachmentid=\"\' + key.Id + \'\"]\');\r\n if ($element.len" +
"gth > 0) {\r\n $element.hide(300).delay(300).queue(function" +
" () {\r\n if ($element.attr(\'data-mimetype\').toLowerCas" +
"e().indexOf(\'image/\') == 0)\r\n Shadowbox.removeCac" +
"he(this);\r\n $element.remove();\r\n " +
" });\r\n }\r\n }\r\n }\r\n\r\n\r\n\r\n " +
" $attachmentOutput.children(\'a\').each(function () {\r\n $this = $" +
"(this);\r\n if ($this.attr(\'data-mimetype\').toLowerCase().indexOf(\'" +
"image/\') == 0)\r\n $this.shadowbox({ gallery: \'attachments\', pl" +
"ayer: \'img\', title: $this.find(\'.comments\').text() });\r\n });\r\n\r\n " +
" // Add Globally Available Functions\r\n document.DiscoFunctions." +
"liveAddAttachment = addAttachment;\r\n document.DiscoFunctions.liveRemo" +
"veAttachment = removeAttachment;\r\n\r\n //#endregion\r\n });\r\n\r\n\r\n " +
" </script>\r\n");
"tamp\').text(a.TimestampFull).attr(\'title\', a.TimestampFull).livestamp(a.Timestam" +
"pUnixEpoc);\r\n if (canRemove)\r\n e.find(" +
"\'.remove\').click(removeLocalAttachment);\r\n if (!quick)\r\n " +
" e.hide();\r\n $attachmentOutput.append(e);\r\n" +
" if (!quick)\r\n e.show(\'slow\');\r\n " +
" if (a.MimeType.toLowerCase().indexOf(\'image/\') == 0)\r\n " +
" e.shadowbox({ gallery: \'attachments\', player: \'img\', title: a.Commen" +
"ts });\r\n }\r\n }\r\n\r\n function removeAttachmen" +
"t(key) {\r\n if (key.JobId == jobId) {\r\n var $el" +
"ement = $attachmentOutput.find(\'a[data-attachmentid=\"\' + key.Id + \'\"]\');\r\n " +
" if ($element.length > 0) {\r\n $element.hide(" +
"300).delay(300).queue(function () {\r\n if ($element.at" +
"tr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n " +
" Shadowbox.removeCache(this);\r\n $element.re" +
"move();\r\n });\r\n }\r\n }\r\n" +
" }\r\n\r\n\r\n\r\n $attachmentOutput.children(\'a\').each(function (" +
") {\r\n $this = $(this);\r\n if ($this.attr(\'data-mime" +
"type\').toLowerCase().indexOf(\'image/\') == 0)\r\n $this.shadowbo" +
"x({ gallery: \'attachments\', player: \'img\', title: $this.find(\'.comments\').text()" +
" });\r\n });\r\n\r\n // Add Globally Available Functions\r\n " +
" document.DiscoFunctions.liveAddAttachment = addAttachment;\r\n do" +
"cument.DiscoFunctions.liveRemoveAttachment = removeAttachment;\r\n\r\n //" +
"#endregion\r\n });\r\n\r\n\r\n </script>\r\n");
#line 520 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 522 "..\..\Views\Job\JobParts\Resources.cshtml"
}
#line default
#line hidden
#line 521 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 523 "..\..\Views\Job\JobParts\Resources.cshtml"
if (canShowLogs && canShowAttachments)
{
@@ -1349,7 +1362,7 @@ WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.C
WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'");
#line 525 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 527 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id);
@@ -1378,7 +1391,7 @@ WriteLiteral("\');\r\n\r\n //#region LiveEvents\r\n functi
" var liveMessagesConnection = $.connection(\'");
#line 558 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 560 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications"));
@@ -1397,7 +1410,7 @@ WriteLiteral(@"', { addToGroups: 'JobLog,JobAttachment' })
");
#line 568 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 570 "..\..\Views\Job\JobParts\Resources.cshtml"
}
else if (canShowLogs)
{
@@ -1408,7 +1421,7 @@ else if (canShowLogs)
WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'");
#line 573 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 575 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id);
@@ -1436,7 +1449,7 @@ WriteLiteral(@"');
var liveMessagesConnection = $.connection('");
#line 592 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 594 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications"));
@@ -1455,7 +1468,7 @@ WriteLiteral(@"', { addToGroups: 'JobLog' })
");
#line 602 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 604 "..\..\Views\Job\JobParts\Resources.cshtml"
}
else if (canShowAttachments)
{
@@ -1466,7 +1479,7 @@ else if (canShowAttachments)
WriteLiteral(" <script>\r\n $(function () {\r\n var jobId = parseInt(\'");
#line 607 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 609 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Model.Job.Id);
@@ -1492,7 +1505,7 @@ WriteLiteral(@"');
var liveMessagesConnection = $.connection('");
#line 624 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 626 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications"));
@@ -1511,7 +1524,7 @@ WriteLiteral(@"', { addToGroups: 'JobAttachment' })
");
#line 634 "..\..\Views\Job\JobParts\Resources.cshtml"
#line 636 "..\..\Views\Job\JobParts\Resources.cshtml"
}
Disco.Web/Views/Job/JobParts/_Subject.cshtml
+3 -3
View File
@@ -202,7 +202,7 @@
{
<div id="Job_Show_Device_Details_HWar">
<div>DEVICE WARRANTY</div>
<div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.FromNow("Unknown")</span></div>
<div>Until: <span id="Job_Show_Device_Details_HWar_ValidUntil" data-livestamp="@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToUnixEpoc()">@Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFullDateTime("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.WarrantyDetails))
{
<a id="Job_Show_Device_Details_HWar_Details_Button" href="#">Show Details</a>
@@ -232,7 +232,7 @@
<div id="Job_Show_Device_Details_HNWar">
<div>INSURANCE</div>
<div id="Job_Show_Device_Details_HNWar_InsuranceSupplier">@Model.Job.Device.DeviceBatch.InsuranceSupplier</div>
<div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil">@Model.Job.Device.DeviceBatch.InsuredUntil.FromNow("Unknown")</span></div>
<div>Until: <span id="Job_Show_Device_Details_HNWar_ValidUntil" data-livestamp="@Model.Job.Device.DeviceBatch.InsuredUntil.ToUnixEpoc()">@Model.Job.Device.DeviceBatch.InsuredUntil.ToFullDateTime("Unknown")</span></div>
@if (!string.IsNullOrWhiteSpace(Model.Job.Device.DeviceBatch.InsuranceDetails))
{
<a id="Job_Show_Device_Details_HNWar_Details_Button" href="#">Show Details</a>
@@ -370,7 +370,7 @@
{
<div id="Job_Show_User_WaitingForUserAction" class="status">
<h4>Awaiting Action</h4>
Since: @Model.Job.WaitingForUserAction.FromNow()
Since: <span data-livestamp="@Model.Job.WaitingForUserAction.ToUnixEpoc()">@Model.Job.WaitingForUserAction.ToFullDateTime()</span>
</div>
}
</div>
Disco.Web/Views/Job/JobParts/_Subject.generated.cs
+78 -43
View File
@@ -840,11 +840,22 @@ WriteLiteral(">\r\n <div>DEVICE WARRANTY</div>\r\
WriteLiteral(" id=\"Job_Show_Device_Details_HWar_ValidUntil\"");
WriteLiteral(" data-livestamp=\"");
#line 205 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToUnixEpoc());
#line default
#line hidden
WriteLiteral("\"");
WriteLiteral(">");
#line 205 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.FromNow("Unknown"));
Write(Model.Job.Device.DeviceBatch.WarrantyValidUntil.ToFullDateTime("Unknown"));
#line default
@@ -879,17 +890,17 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HWar_Details_Dialog\"");
WriteLiteral(" class=\"dialog\"");
WriteAttribute("title", Tuple.Create(" title=\"", 13905), Tuple.Create("\"", 13970)
, Tuple.Create(Tuple.Create("", 13913), Tuple.Create("Warranty", 13913), true)
, Tuple.Create(Tuple.Create(" ", 13921), Tuple.Create("Details", 13922), true)
, Tuple.Create(Tuple.Create(" ", 13929), Tuple.Create("for", 13930), true)
WriteAttribute("title", Tuple.Create(" title=\"", 13991), Tuple.Create("\"", 14056)
, Tuple.Create(Tuple.Create("", 13999), Tuple.Create("Warranty", 13999), true)
, Tuple.Create(Tuple.Create(" ", 14007), Tuple.Create("Details", 14008), true)
, Tuple.Create(Tuple.Create(" ", 14015), Tuple.Create("for", 14016), true)
#line 209 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create(" ", 13933), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
, Tuple.Create(Tuple.Create(" ", 14019), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
#line default
#line hidden
, 13934), false)
, 14020), false)
);
WriteLiteral(">\r\n <div>");
@@ -964,11 +975,22 @@ WriteLiteral("</div>\r\n <div>Until: <span");
WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_ValidUntil\"");
WriteLiteral(" data-livestamp=\"");
#line 235 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.Device.DeviceBatch.InsuredUntil.ToUnixEpoc());
#line default
#line hidden
WriteLiteral("\"");
WriteLiteral(">");
#line 235 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.Device.DeviceBatch.InsuredUntil.FromNow("Unknown"));
Write(Model.Job.Device.DeviceBatch.InsuredUntil.ToFullDateTime("Unknown"));
#line default
@@ -1003,17 +1025,17 @@ WriteLiteral(" id=\"Job_Show_Device_Details_HNWar_Details_Dialog\"");
WriteLiteral(" class=\"dialog\"");
WriteAttribute("title", Tuple.Create(" title=\"", 16153), Tuple.Create("\"", 16219)
, Tuple.Create(Tuple.Create("", 16161), Tuple.Create("Insurance", 16161), true)
, Tuple.Create(Tuple.Create(" ", 16170), Tuple.Create("Details", 16171), true)
, Tuple.Create(Tuple.Create(" ", 16178), Tuple.Create("for", 16179), true)
WriteAttribute("title", Tuple.Create(" title=\"", 16319), Tuple.Create("\"", 16385)
, Tuple.Create(Tuple.Create("", 16327), Tuple.Create("Insurance", 16327), true)
, Tuple.Create(Tuple.Create(" ", 16336), Tuple.Create("Details", 16337), true)
, Tuple.Create(Tuple.Create(" ", 16344), Tuple.Create("for", 16345), true)
#line 239 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create(" ", 16182), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
, Tuple.Create(Tuple.Create(" ", 16348), Tuple.Create<System.Object, System.Int32>(Model.Job.Device.DeviceBatch.Name
#line default
#line hidden
, 16183), false)
, 16349), false)
);
WriteLiteral(">\r\n <div>");
@@ -1495,15 +1517,15 @@ WriteLiteral(" title=\"Email Address\"");
WriteLiteral(">Email: <a");
WriteAttribute("href", Tuple.Create(" href=\"", 24754), Tuple.Create("\"", 24798)
, Tuple.Create(Tuple.Create("", 24761), Tuple.Create("mailto:", 24761), true)
WriteAttribute("href", Tuple.Create(" href=\"", 24920), Tuple.Create("\"", 24964)
, Tuple.Create(Tuple.Create("", 24927), Tuple.Create("mailto:", 24927), true)
#line 367 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 24768), Tuple.Create<System.Object, System.Int32>(Model.Job.User.EmailAddress
, Tuple.Create(Tuple.Create("", 24934), Tuple.Create<System.Object, System.Int32>(Model.Job.User.EmailAddress
#line default
#line hidden
, 24768), false)
, 24934), false)
);
WriteLiteral(">");
@@ -1542,16 +1564,29 @@ WriteLiteral(" id=\"Job_Show_User_WaitingForUserAction\"");
WriteLiteral(" class=\"status\"");
WriteLiteral(">\r\n <h4>Awaiting Action</h4>\r\n " +
" Since: ");
" Since: <span");
WriteLiteral(" data-livestamp=\"");
#line 373 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.WaitingForUserAction.FromNow());
Write(Model.Job.WaitingForUserAction.ToUnixEpoc());
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
WriteLiteral("\"");
WriteLiteral(">");
#line 373 "..\..\Views\Job\JobParts\_Subject.cshtml"
Write(Model.Job.WaitingForUserAction.ToFullDateTime());
#line default
#line hidden
WriteLiteral("</span>\r\n </div>\r\n");
#line 375 "..\..\Views\Job\JobParts\_Subject.cshtml"
@@ -1977,14 +2012,14 @@ WriteLiteral(" type=\"hidden\"");
WriteLiteral(" name=\"JobId\"");
WriteAttribute("value", Tuple.Create(" value=\"", 35345), Tuple.Create("\"", 35366)
WriteAttribute("value", Tuple.Create(" value=\"", 35593), Tuple.Create("\"", 35614)
#line 564 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 35353), Tuple.Create<System.Object, System.Int32>(Model.Job.Id
, Tuple.Create(Tuple.Create("", 35601), Tuple.Create<System.Object, System.Int32>(Model.Job.Id
#line default
#line hidden
, 35353), false)
, 35601), false)
);
WriteLiteral(" />\r\n");
@@ -2048,26 +2083,26 @@ WriteLiteral("\"");
WriteLiteral(">\r\n <i");
WriteAttribute("class", Tuple.Create(" class=\"", 35815), Tuple.Create("\"", 35882)
, Tuple.Create(Tuple.Create("", 35823), Tuple.Create("fa", 35823), true)
, Tuple.Create(Tuple.Create(" ", 35825), Tuple.Create("fa-", 35826), true)
WriteAttribute("class", Tuple.Create(" class=\"", 36063), Tuple.Create("\"", 36130)
, Tuple.Create(Tuple.Create("", 36071), Tuple.Create("fa", 36071), true)
, Tuple.Create(Tuple.Create(" ", 36073), Tuple.Create("fa-", 36074), true)
#line 569 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 35829), Tuple.Create<System.Object, System.Int32>(jobQueue.Icon
, Tuple.Create(Tuple.Create("", 36077), Tuple.Create<System.Object, System.Int32>(jobQueue.Icon
#line default
#line hidden
, 35829), false)
, Tuple.Create(Tuple.Create(" ", 35845), Tuple.Create("fa-fw", 35846), true)
, Tuple.Create(Tuple.Create(" ", 35851), Tuple.Create("fa-lg", 35852), true)
, Tuple.Create(Tuple.Create(" ", 35857), Tuple.Create("d-", 35858), true)
, 36077), false)
, Tuple.Create(Tuple.Create(" ", 36093), Tuple.Create("fa-fw", 36094), true)
, Tuple.Create(Tuple.Create(" ", 36099), Tuple.Create("fa-lg", 36100), true)
, Tuple.Create(Tuple.Create(" ", 36105), Tuple.Create("d-", 36106), true)
#line 569 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 35860), Tuple.Create<System.Object, System.Int32>(jobQueue.IconColour
, Tuple.Create(Tuple.Create("", 36108), Tuple.Create<System.Object, System.Int32>(jobQueue.IconColour
#line default
#line hidden
, 35860), false)
, 36108), false)
);
WriteLiteral("></i>");
@@ -2108,27 +2143,27 @@ WriteLiteral(" ");
#line hidden
WriteLiteral(" <i");
WriteAttribute("class", Tuple.Create(" class=\"", 36196), Tuple.Create("\"", 36244)
, Tuple.Create(Tuple.Create("", 36204), Tuple.Create("fa", 36204), true)
, Tuple.Create(Tuple.Create(" ", 36206), Tuple.Create("d-priority-", 36207), true)
WriteAttribute("class", Tuple.Create(" class=\"", 36444), Tuple.Create("\"", 36492)
, Tuple.Create(Tuple.Create("", 36452), Tuple.Create("fa", 36452), true)
, Tuple.Create(Tuple.Create(" ", 36454), Tuple.Create("d-priority-", 36455), true)
#line 576 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 36218), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
, Tuple.Create(Tuple.Create("", 36466), Tuple.Create<System.Object, System.Int32>(priorityValue.ToLower()
#line default
#line hidden
, 36218), false)
, 36466), false)
);
WriteAttribute("title", Tuple.Create(" title=\"", 36245), Tuple.Create("\"", 36278)
WriteAttribute("title", Tuple.Create(" title=\"", 36493), Tuple.Create("\"", 36526)
#line 576 "..\..\Views\Job\JobParts\_Subject.cshtml"
, Tuple.Create(Tuple.Create("", 36253), Tuple.Create<System.Object, System.Int32>(priorityValue
, Tuple.Create(Tuple.Create("", 36501), Tuple.Create<System.Object, System.Int32>(priorityValue
#line default
#line hidden
, 36253), false)
, Tuple.Create(Tuple.Create(" ", 36269), Tuple.Create("Priority", 36270), true)
, 36501), false)
, Tuple.Create(Tuple.Create(" ", 36517), Tuple.Create("Priority", 36518), true)
);
WriteLiteral("></i>\r\n </div>\r\n <div>\r\n " +