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/Areas/API/Controllers/DeviceController.cs
+1 -1
View File
@@ -373,7 +373,7 @@ namespace Disco.Web.Areas.API.Controllers
var result = new
{
Timestamp = device.LastNetworkLogonDate,
Friendly = device.LastNetworkLogonDate.FromNow("Unknown"),
UnixEpoc = device.LastNetworkLogonDate.ToUnixEpoc(),
Formatted = device.LastNetworkLogonDate.ToFullDateTime("Unknown")
};
Disco.Web/Areas/API/Controllers/DocumentTemplateController.cs
+2 -2
View File
@@ -279,8 +279,8 @@ namespace Disco.Web.Areas.API.Controllers
var m = undetectedDirectory.GetFiles("*.pdf").Select(f => new Models.DocumentTemplate.ImporterUndetectedFilesModel()
{
Id = System.IO.Path.GetFileNameWithoutExtension(f.Name),
Timestamp = f.CreationTime.ToString(),
TimestampFuzzy = f.CreationTime.FromNow()
Timestamp = f.CreationTime.ToFullDateTime(),
TimestampUnixEpoc = f.CreationTime.ToUnixEpoc()
}).ToArray();
return Json(m);
Disco.Web/Areas/API/Models/Attachment/_AttachmentModel.cs
+2 -22
View File
@@ -17,28 +17,8 @@ namespace Disco.Web.Areas.API.Models.Attachment
public string Comments { get; set; }
public string Filename { get; set; }
public string MimeType { get; set; }
public string TimestampFuzzy
{
get
{
return Timestamp.FromNow();
}
set
{
// Ignore
}
}
public string TimestampFull
{
get
{
return Timestamp.ToFullDateTime();
}
set
{
// Ignore
}
}
public long TimestampUnixEpoc { get { return Timestamp.ToUnixEpoc(); } }
public string TimestampFull { get { return Timestamp.ToFullDateTime(); } }
public static _AttachmentModel FromAttachment(Disco.Models.Repository.UserAttachment ua)
{
Disco.Web/Areas/API/Models/DocumentTemplate/ImporterUndetectedFilesModel.cs
+1 -1
View File
@@ -9,6 +9,6 @@ namespace Disco.Web.Areas.API.Models.DocumentTemplate
{
public string Id { get; set; }
public string Timestamp { get; set; }
public string TimestampFuzzy { get; set; }
public long TimestampUnixEpoc { get; set; }
}
}
Disco.Web/Areas/API/Models/Job/_CommentModel.cs
+2 -22
View File
@@ -15,28 +15,8 @@ namespace Disco.Web.Areas.API.Models.Job
public string Author { get; set; }
public DateTime Timestamp { get; set; }
public string Comments { get; set; }
public string TimestampFuzzy
{
get
{
return Timestamp.FromNow();
}
set
{
// Ignore
}
}
public string TimestampFull
{
get
{
return Timestamp.ToFullDateTime();
}
set
{
// Ignore
}
}
public long TimestampUnixEpoc { get { return this.Timestamp.ToUnixEpoc(); } }
public string TimestampFull { get { return Timestamp.ToFullDateTime(); } }
public static _CommentModel FromJobLog(Disco.Models.Repository.JobLog jl)
{
Disco.Web/Areas/API/Models/Job/_DateChangeModel.cs
+4 -4
View File
@@ -13,14 +13,14 @@ namespace Disco.Web.Areas.API.Models.Job
public string UserDescription { get; set; }
public string DateTimeFull { get; set; }
public string DateTimeFriendly { get; set; }
public string DateTimeJavascript { get; set; }
public long DateTimeSortable { get; set; }
public string DateTimeISO8601 { get; set; }
public long DateTimeUnixEpoc { get; set; }
public _DateChangeModel SetDateTime(DateTime? date)
{
this.DateTimeFriendly = date.FromNow(null);
this.DateTimeJavascript = date.ToJavaScript();
this.DateTimeSortable = date.ToSortable();
this.DateTimeISO8601 = date.ToISO8601();
this.DateTimeUnixEpoc = date.ToUnixEpoc() ?? -1;
this.DateTimeFull = date.ToFullDateTime(null);
return this;