User: cmicali
Date: 06/08/29 08:53:41
Modified: documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain
TimecardDaoImpl.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
SearchTimecards.aspx SearchTimecards.aspx.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style
global.css
Log:
- Fixed date filtering on search screen
- Fixed approver filtering on search screen
- Fixed style for checkbox on login screen
Revision Changes Path
1.4 +1 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs
Index: TimecardDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Core/src/Northwind/TimeTracker/Domain/TimecardDaoImpl.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- TimecardDaoImpl.cs 29 Aug 2006 05:02:06 -0000 1.3
+++ TimecardDaoImpl.cs 29 Aug 2006 15:53:37 -0000 1.4
@@ -36,7 +36,7 @@
if (criteria.ApproverId.HasValue)
{
- timecardCriteria.CreateCriteria("Approver").Add(Expression.Eq("Id", criteria.SubmitterId.Value));
+ timecardCriteria.CreateCriteria("Approver").Add(Expression.Eq("Id", criteria.ApproverId.Value));
}
if (criteria.Status != null && criteria.Status.Length > 0)
1.5 +2 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx
Index: SearchTimecards.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- SearchTimecards.aspx 29 Aug 2006 05:02:08 -0000 1.4
+++ SearchTimecards.aspx 29 Aug 2006 15:53:37 -0000 1.5
@@ -57,12 +57,12 @@
<h3>Start Date Minimum</h3>
<asp:TextBox ID="txtStartDateMin" runat="server" />
<asp:RegularExpressionValidator ID="reqStartDateMin" runat="server"
- ValidationExpression="\d\d/\d\d/\d\d\d\d" ControlToValidate="txtStartDateMin" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
+ ValidationExpression="\d\d?/\d\d?/\d\d\d\d" ControlToValidate="txtStartDateMin" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
<h3>Start Date Maximum</h3>
<asp:TextBox ID="txtStartDateMax" runat="server" />
<asp:RegularExpressionValidator ID="reqStartDateMax" runat="server"
- ValidationExpression="\d\d/\d\d/\d\d\d\d" ControlToValidate="txtStartDateMax" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
+ ValidationExpression="\d\d?/\d\d?/\d\d\d\d" ControlToValidate="txtStartDateMax" CssClass="tinytext"><br />Must be MM/DD/YYY format</asp:RegularExpressionValidator>
<br /><br />
<asp:LinkButton runat="server" ID="btnSearch" Text="Search" CssClass="button" OnClick="btnSearch_Click" />
1.2 +10 -0 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx.cs
Index: SearchTimecards.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/SearchTimecards.aspx.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SearchTimecards.aspx.cs 28 Aug 2006 04:22:21 -0000 1.1
+++ SearchTimecards.aspx.cs 29 Aug 2006 15:53:37 -0000 1.2
@@ -43,6 +43,16 @@
criteria.Status[0] = (TimecardStatus)Enum.Parse(typeof(TimecardStatus), ddlStatus.SelectedValue);
}
+ if (txtStartDateMin.Text.Length > 0)
+ {
+ criteria.StartDateMin = DateTime.Parse(txtStartDateMin.Text);
+ }
+
+ if (txtStartDateMax.Text.Length > 0)
+ {
+ criteria.StartDateMax = DateTime.Parse(txtStartDateMax.Text);
+ }
+
dgSearchResults.DataSource = service.FindTimecards(criteria);
dgSearchResults.DataBind();
}
1.2 +2 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style/global.css
Index: global.css
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/Style/global.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- global.css 28 Aug 2006 04:22:24 -0000 1.1
+++ global.css 29 Aug 2006 15:53:38 -0000 1.2
@@ -138,7 +138,8 @@
font-weight: bold;
}
-.checkbox
+.checkbox,
+.checkbox input
{
border: none;
}
|
