Skip to content

Commit 343fb3c

Browse files
VaughnRuppVaughnRupp
committed
#249 Logs - Fractional Time added to all logs. CLOSE #249 
1 parent 8f1757e commit 343fb3c

5 files changed

Lines changed: 31 additions & 28 deletions

File tree

‎UI/Web/eventlogs.aspx‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
<%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="eventlogs.aspx.cs" Inherits="eventlogs" %>
2-
<%@ MasterType virtualpath="~/MasterPage.master" %>
3-
4-
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" runat="Server">
5-
<div class="row-fluid">
6-
<div class="span1"></div>
7-
<div class="span10">
8-
<asp:GridView ID="eventLogGridView" AutoGenerateColumns="false" runat="server" GridLines="None" CssClass="mGrid" AlternatingRowStyle-CssClass="alt" EmptyDataText="No Entries Found">
9-
<Columns>
10-
<asp:BoundField DataField="log_time" HeaderText="Time" ItemStyle-Width="10em" />
11-
<asp:BoundField DataField="object_name" HeaderText="Object Name" />
12-
<asp:BoundField DataField="event_label" HeaderText="Event" />
13-
<asp:BoundField DataField="parameter_1" HeaderText="Parameter 1" />
14-
<asp:BoundField DataField="parameter_2" HeaderText="Parameter 2" />
15-
<asp:BoundField DataField="from_object_name" HeaderText="From" />
16-
</Columns>
17-
</asp:GridView>
18-
<asp:Button class="btn" runat="server" ID="clearLogButton" Text="Clear Event Log" OnClick="clearLogButton_Click" />
19-
</div>
20-
<div class="span1"></div>
21-
</div>
22-
</asp:Content>
23-
1+
<%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="eventlogs.aspx.cs" Inherits="eventlogs" %>
2+
<%@ MasterType virtualpath="~/MasterPage.master" %>
3+
4+
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" runat="Server">
5+
<div class="row-fluid">
6+
<div class="span1"></div>
7+
<div class="span10">
8+
<asp:GridView ID="eventLogGridView" AutoGenerateColumns="False" runat="server" GridLines="None" CssClass="mGrid" AlternatingRowStyle-CssClass="alt" EmptyDataText="No Entries Found">
9+
<AlternatingRowStyle CssClass="alt"></AlternatingRowStyle>
10+
<Columns>
11+
<asp:BoundField DataField="log_time" HeaderText="Time" ItemStyle-Width="12em" />
12+
<asp:BoundField DataField="object_name" HeaderText="Object Name" />
13+
<asp:BoundField DataField="event_label" HeaderText="Event" />
14+
<asp:BoundField DataField="parameter_1" HeaderText="Parameter 1" />
15+
<asp:BoundField DataField="parameter_2" HeaderText="Parameter 2" />
16+
<asp:BoundField DataField="from_object_name" HeaderText="From" />
17+
</Columns>
18+
</asp:GridView>
19+
<asp:Button class="btn" runat="server" ID="clearLogButton" Text="Clear Event Log" OnClick="clearLogButton_Click" />
20+
</div>
21+
<div class="span1"></div>
22+
</div>
23+
</asp:Content>
24+

‎UI/Web/eventlogs.aspx.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private void BindData()
1919
{
2020
try
2121
{
22-
eventLogGridView.DataSource = OSAESql.RunSQL("SELECT DATE_FORMAT(log_time,'%m/%d %h:%i:%s %p') as log_time,object_name,event_label,parameter_1,parameter_2,from_object_name FROM osae_v_event_log ORDER BY osae_v_event_log.log_time DESC LIMIT 500");
22+
eventLogGridView.DataSource = OSAESql.RunSQL("SELECT DATE_FORMAT(log_time,'%m-%d %H:%i:%s.%f') as log_time,object_name,event_label,parameter_1,parameter_2,from_object_name FROM osae_v_event_log ORDER BY osae_v_event_log.log_time DESC LIMIT 500");
2323
eventLogGridView.DataBind();
2424
}
2525
catch (Exception ex)

‎UI/Web/logs.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
CssClass="mGrid"
2727
AlternatingRowStyle-CssClass="alt" >
2828
<Columns>
29-
<asp:BoundField HeaderText="Time" DataField="Date" ItemStyle-Width="10em"/>
29+
<asp:BoundField HeaderText="Time" DataField="log_time" ItemStyle-Width="12em"/>
3030
<asp:BoundField HeaderText="Level" DataField="Level"/>
3131
<asp:TemplateField>
3232
<HeaderTemplate>

‎UI/Web/methodlog.aspx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="methodlog.aspx.cs" Inherits="methodlog" %>
2+
<%@ MasterType virtualpath="~/MasterPage.master" %>
23

34
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder" runat="Server">
45
<div class="row-fluid">
56
<div class="span1"></div>
67
<div class="span10">
7-
<asp:GridView ID="methodLogGridView" AutoGenerateColumns="false" runat="server" GridLines="None" CssClass="mGrid" AlternatingRowStyle-CssClass="alt" EmptyDataText="No Entries Found">
8+
<asp:GridView ID="methodLogGridView" AutoGenerateColumns="False" runat="server" GridLines="None" CssClass="mGrid" AlternatingRowStyle-CssClass="alt" EmptyDataText="No Entries Found">
9+
<AlternatingRowStyle CssClass="alt"></AlternatingRowStyle>
810
<Columns>
9-
<asp:BoundField DataField="entry_time" HeaderText="Time" ItemStyle-Width="10em" />
11+
<asp:BoundField DataField="entry_time" HeaderText="Time" ItemStyle-Width="12em" />
1012
<asp:BoundField DataField="object_name" HeaderText="Object" />
1113
<asp:BoundField DataField="method_name" HeaderText="Method" />
1214
<asp:BoundField DataField="parameter_1" HeaderText="Parameter 1" />

‎UI/Web/methodlog.aspx.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private void BindData()
2222
{
2323
try
2424
{
25-
methodLogGridView.DataSource = OSAESql.RunSQL("SELECT DATE_FORMAT(entry_time,'%m/%d %h:%i:%s %p') as entry_time, osae_v_method_log.object_name, method_name, if(method_name='RUN SCRIPT', (select script_name from osae_script where script_id=parameter_1), parameter_1) as parameter_1, parameter_2, osae_object.object_name As from_object FROM osae_v_method_log join osae_object on (osae_v_method_log.from_object_id = osae_object.object_id) ORDER BY osae_v_method_log.entry_time DESC, method_log_id DESC LIMIT 500");
25+
methodLogGridView.DataSource = OSAESql.RunSQL("SELECT DATE_FORMAT(entry_time,'%m-%d %H:%i:%s.%f') as entry_time, osae_v_method_log.object_name, method_name, if(method_name='RUN SCRIPT', (select script_name from osae_script where script_id=parameter_1), parameter_1) as parameter_1, parameter_2, osae_object.object_name As from_object FROM osae_v_method_log join osae_object on (osae_v_method_log.from_object_id = osae_object.object_id) ORDER BY osae_v_method_log.entry_time DESC LIMIT 500");
2626
methodLogGridView.DataBind();
2727
}
2828
catch (Exception ex)

0 commit comments

Comments
 (0)