Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web SearchTimecards.aspx.cs TimecardDetails.aspx TimecardDetails.aspx.cs
User: cmicali
Date: 06/08/31 17:21:34
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/App_Code
DataSourceUtils.cs
documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web
SearchTimecards.aspx.cs TimecardDetails.aspx
TimecardDetails.aspx.cs
Log:
Revision Changes Path
1.6 +5 -5 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- TimecardDaoImpl.cs 31 Aug 2006 23:37:46 -0000 1.5
+++ TimecardDaoImpl.cs 1 Sep 2006 00:21:34 -0000 1.6
@@ -68,11 +68,11 @@
valueObject.SubmitterName = string.Empty;
if (entity.Approver != null)
{
- valueObject.ApproverName = entity.Approver.FirstName + " " + entity.Approver.LastName;
+ valueObject.ApproverName = entity.Approver.Username;
}
if (entity.Submitter != null)
{
- valueObject.SubmitterName = entity.Submitter.FirstName + " " + entity.Submitter.LastName;
+ valueObject.SubmitterName = entity.Submitter.Username;
}
}
@@ -104,10 +104,12 @@
if (timecardVO.Id > 0)
{
entity = this.Load(timecardVO.Id);
- if (entity.Status != TimecardStatus.Draft)
+ if (entity.Status != TimecardStatus.Draft && entity.Status != TimecardStatus.Rejected)
{
throw new Exception("Unable to save Timecard in " + entity.Status.ToString() + " status");
}
+ entity.StartDate = timecardVO.StartDate;
+ entity.Submitter = this.UserDao.FindByUsername(timecardVO.SubmitterName);
}
else
{
@@ -116,9 +118,7 @@
}
entity.Comments = timecardVO.Comments;
- entity.StartDate = timecardVO.StartDate;
entity.Approver = this.UserDao.FindByUsername(timecardVO.ApproverName);
- entity.Submitter = this.UserDao.FindByUsername(timecardVO.SubmitterName);
// Update existing and remove missing allocations
ArrayList allocationsToRemove = new ArrayList();
1.4 +0 -1 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs
Index: DataSourceUtils.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/App_Code/DataSourceUtils.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- DataSourceUtils.cs 31 Aug 2006 23:37:46 -0000 1.3
+++ DataSourceUtils.cs 1 Sep 2006 00:21:34 -0000 1.4
@@ -45,7 +45,6 @@
}
}
-
public static TimeTrackerUser[] GetAllUsers()
{
MembershipUserCollection membershipUsers = Membership.GetAllUsers();
1.3 +1 -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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- SearchTimecards.aspx.cs 29 Aug 2006 15:53:37 -0000 1.2
+++ SearchTimecards.aspx.cs 1 Sep 2006 00:21:34 -0000 1.3
@@ -56,4 +56,5 @@
dgSearchResults.DataSource = service.FindTimecards(criteria);
dgSearchResults.DataBind();
}
+
}
1.5 +10 -2 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx
Index: TimecardDetails.aspx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- TimecardDetails.aspx 31 Aug 2006 23:37:47 -0000 1.4
+++ TimecardDetails.aspx 1 Sep 2006 00:21:34 -0000 1.5
@@ -67,7 +67,9 @@
<HeaderTemplate>
<table class="full_width">
<colgroup span="4" style="width:22%;" />
+ <% if (!ReadOnly) { %>
<colgroup span="1" style="width:12%;" />
+ <% } %>
<thead>
<tr>
<th>Date</th>
@@ -75,9 +77,11 @@
<th>End</th>
<th>Task</th>
+ <% if (!ReadOnly) { %>
<th class="align_center">
- <asp:LinkButton ID="btnDeleteAllocation" runat="server" CssClass="button" Text="Delete" OnClick="btnDeleteAllocation_Click"/>
+ <asp:LinkButton ID="btnDeleteAllocation" runat="server" CssClass="button" Text="Delete" OnClick="btnDeleteAllocation_Click" ValidationGroup="DeleteAllocation"/>
</th>
+ <% } %>
</tr>
</thead>
<tbody>
@@ -96,12 +100,15 @@
<td><%# ((DateTime)Eval("TimePeriodVO.StartTime")).ToString("t") %></td>
<td><%# ((DateTime)Eval("TimePeriodVO.EndTime")).ToString("t") %></td>
<td><%# ddlTasks.Items.FindByValue(Eval("TaskId").ToString()) %></td>
+ <% if (!ReadOnly) { %>
<td><center><asp:CheckBox ID="cbDelete" runat="server" /></center></td>
+ <% } %>
+
</tr>
</ItemTemplate>
</asp:Repeater>
-
+ <asp:Panel runat="server" ID="pnlAddAllocation">
<table class="add_allocation_table bordered_table full_width">
<colgroup span="4" style="width:22%;" />
<colgroup span="1" style="width:12%;" />
@@ -136,6 +143,7 @@
</tbody>
</table>
+ </asp:Panel>
</div>
<div class="comments">
1.5 +40 -10 plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs
Index: TimecardDetails.aspx.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/documentation/samples/time-tracker-dotnet-maven2/Northwind.TimeTracker/Northwind.TimeTracker.Web/TimecardDetails.aspx.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- TimecardDetails.aspx.cs 31 Aug 2006 23:39:44 -0000 1.4
+++ TimecardDetails.aspx.cs 1 Sep 2006 00:21:34 -0000 1.5
@@ -15,6 +15,14 @@
public partial class TimecardDetails : System.Web.UI.Page
{
+ private bool m_ReadOnly = true;
+
+ public bool ReadOnly
+ {
+ get { return m_ReadOnly = true; }
+ set { m_ReadOnly = value; }
+ }
+
protected ArrayList Allocations
{
get
@@ -75,9 +83,9 @@
ddlTasks.DataBind();
ddlApprover.DataBind();
- lblSubmitter.Text = timecard.SubmitterName;
+ lblSubmitter.Text = ddlApprover.Items.FindByValue(timecard.SubmitterName).Text;
this.Title = timecard.ApproverName;
- ListItem approverItem = ddlApprover.Items.FindByText(timecard.ApproverName);
+ ListItem approverItem = ddlApprover.Items.FindByValue(timecard.ApproverName);
if (approverItem != null)
{
approverItem.Selected = true;
@@ -100,8 +108,30 @@
rptAllocations.DataBind();
if (timecard.Status == TimecardStatus.Approved ||
- timecard.Status == TimecardStatus.Submitted)
+ timecard.Status == TimecardStatus.Submitted
+ // || Submitter != current user
+ )
{
+ DisableScreen();
+ }
+ else
+ {
+ ReadOnly = true;
+ }
+
+ }
+
+
+ protected void DisableScreen()
+ {
+ ddlApprover.Enabled = false;
+ txtComments.Enabled = false;
+ txtEndTime.Enabled = false;
+ txtStartTime.Enabled = false;
+ ddlTasks.Enabled = false;
+ btnAdd.Enabled = false;
+ btnAdd.CssClass = "disabledbutton";
+
btnSave.Enabled = false;
btnSave.CssClass = "disabledbutton";
@@ -110,8 +140,8 @@
btnSubmit.Enabled = false;
btnSubmit.CssClass = "disabledbutton";
- }
+ pnlAddAllocation.Visible = false;
}
protected void BuildStartDateDropdown(DateTime startDate)
|
