Skip to content

modified AddHoliday ui #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hmandal wants to merge 6 commits into
base: master
Choose a base branch
from
Open

modified AddHoliday ui #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0c4425
updated ui design
hmandal Jan 17, 2016
7fa5369
added Reporting to Excel worksheet + calendar Ajax support
hmandal Jan 17, 2016
b04d8d0
Merge pull request #1 from GuptaAnupKumar/master
hmandal Jan 17, 2016
88ad58d
updated AddHoliday ui
hmandal Jan 17, 2016
032fd26
modified AddHoliday ui
hmandal Jan 17, 2016
d6d381b
updated to add reporting
hmandal Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .vs/biometric-attendance-system/v14/.suo
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions biometric-attendance-system.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "biometric-attendance-system", "http://localhost:52190", "{C7523DD8-38F1-4A3A-85A5-81FCF1AAA8A8}"
ProjectSection(WebsiteProperties) = preProject
Expand Down
141 changes: 73 additions & 68 deletions biometric-attendance-system/Admin/AddHoliday.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,80 +12,85 @@
<a href="~/Admin/ManageMasterEntries.aspx" class="grey-text">Home &nbsp;&nbsp;></a>
<a href="#!" class="teal-text">&nbsp;&nbsp;Add Holiday &nbsp;&nbsp;</a>
</div>
<div class="col s4 m4 l4 offset-s1 offset-m1 offset-l1 card">
<div class="col s12 m12 l12">
<br />

<div style="margin-left: 35px">
<asp:Calendar ID="Calendar1" runat="server" OnSelectionChanged="Calendar1_SelectionChanged" CssClass="center picker__calendar-container" BackColor="White" BorderColor="#999999" DayNameFormat="Shortest" FirstDayOfWeek="Sunday" Font-Names="Verdana" Font-Size="8pt" ForeColor="Black" ShowGridLines="True" Width="358px">
<DayHeaderStyle BackColor="#CCCCCC" Font-Bold="True" Font-Size="7pt" Height="10px" />
<NextPrevStyle VerticalAlign="Bottom" />
<OtherMonthDayStyle ForeColor="#808080" />
<SelectedDayStyle BackColor="#666666" Font-Bold="True" ForeColor="White" />
<SelectorStyle BackColor="#CCCCCC" />
<TitleStyle BackColor="#999999" BorderColor="Black" Font-Bold="True" />
<TodayDayStyle BackColor="#CCCCCC" ForeColor="Black" />
<WeekendDayStyle BackColor="#FFFFCC" />
</asp:Calendar>
<br />
</div>
<div class="row center">
<asp:Label ID="lblDate" runat="server" CssClass="input-field teal-text" Text="Date"></asp:Label>
</div>
<div class="row">
<asp:TextBox ID="txtHoliday" placeholder="Name of Holiday" CssClass="input-field col l5 m5 s5" runat="server">
</asp:TextBox>
<asp:DropDownList runat="server" ID="ddlStatus" CssClass="input-field btn teal white-text col l5 m5 s5 offset-s2 offset-m2 offset-l2">
<asp:ListItem Text="Holiday" Value="1" />
<asp:ListItem Text="Weekly Off" Value="2" />
</asp:DropDownList>
</div>
<div class="row">
<div class="col s4 m4 l4 offset-s3 offset-m3 offset-l3">
<asp:Button ID="btnAddHoliday" runat="server" Text="Add Holiday" CssClass="btn" OnClick="btnAddHoliday_Click" />
<div class="col s12 m12 l5 card" style="/*margin-left: 35px*/">
<div class="row">
<asp:Calendar ID="Calendar1" runat="server" OnSelectionChanged="Calendar1_SelectionChanged" CssClass="center picker__calendar-container" BackColor="White" BorderColor="#999999" DayNameFormat="Shortest" FirstDayOfWeek="Sunday" Font-Names="Verdana" Font-Size="8pt" ForeColor="Black" ShowGridLines="True" Width="358px">
<DayHeaderStyle BackColor="#CCCCCC" Font-Bold="True" Font-Size="7pt" Height="10px" />
<NextPrevStyle VerticalAlign="Bottom" />
<OtherMonthDayStyle ForeColor="#808080" />
<SelectedDayStyle BackColor="#666666" Font-Bold="True" ForeColor="White" />
<SelectorStyle BackColor="#CCCCCC" />
<TitleStyle BackColor="#999999" BorderColor="Black" Font-Bold="True" />
<TodayDayStyle BackColor="#CCCCCC" ForeColor="Black" />
<WeekendDayStyle BackColor="#FFFFCC" />
</asp:Calendar>
</div>
<div class="row">
<div class="row center">
<asp:Label ID="lblDate" runat="server" CssClass="input-field teal-text" Text="Date"></asp:Label>
</div>
<div class="row">
<asp:TextBox ID="txtHoliday" placeholder="Name of Holiday" CssClass="input-field col l5 m5 s12" runat="server">
</asp:TextBox>
<asp:DropDownList runat="server" ID="ddlStatus" CssClass="input-field btn teal white-text col l5 m5 s12 offset-m2 offset-l2">
<asp:ListItem Text="Holiday" Value="1" />
<asp:ListItem Text="Weekly Off" Value="2" />
</asp:DropDownList>
</div>
<div class="row">
<div class="col s12 m4 l4 offset-m3 offset-l3">
<asp:Button ID="btnAddHoliday" runat="server" Text="Add Holiday" CssClass="btn" OnClick="btnAddHoliday_Click" />
</div>
</div>
</div>
<br />
</div>
<%-- GridView Starts--%>
<div class="col s12 m12 l6 offset-l1 card">
<asp:GridView ID="grdHoliday" runat="server" AutoGenerateColumns="false" CssClass="responsive-table striped" EmptyDataText="No Data">
<Columns>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Date" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="lblDate" runat="server" Text='<%#Eval("Date","{0:d}")%>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Name Of Holiday" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="lblNameOfHoliday" runat="server" Text='<%#Eval("NameOfHoliday")%>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Status" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="lblStatus" runat="server" Text='<%# (Convert.ToInt32(Eval("Status").ToString())) == 1 ? "Holiday" : "Weekly Off" %>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Actions" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Button ID="btnDelete" OnClick="btnDelete_Click" CausesValidation="false" CssClass="btn red text-white" CommandArgument='<%#Eval("Id")%>' runat="server" Text="Delete" />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</div>
<%-- GridView Ends --%>
</div>
<br />
</div>
<%-- GridView Starts--%>
<div class="col s5 m5 l5 offset-s1 offset-m1 offset-l1 card">
<asp:GridView ID="grdHoliday" runat="server" AutoGenerateColumns="false" CssClass="responsive-table striped" EmptyDataText="No Data">
<Columns>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Date" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="lblDate" runat="server" Text='<%#Eval("Date","{0:d}")%>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Name Of Holiday" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="lblNameOfHoliday" runat="server" Text='<%#Eval("NameOfHoliday")%>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Status" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Label ID="lblStatus" runat="server" Text='<%# (Convert.ToInt32(Eval("Status").ToString())) == 1 ? "Holiday" : "Weekly Off" %>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<HeaderTemplate>
<asp:Label Text="Actions" runat="server" />
</HeaderTemplate>
<ItemTemplate>
<asp:Button ID="btnDelete" OnClick="btnDelete_Click" CausesValidation="false" CssClass="btn red text-white" CommandArgument='<%#Eval("Id")%>' runat="server" Text="Delete" />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
</div>
<%-- GridView Ends --%>
</div>
</ContentTemplate>
</asp:UpdatePanel>
Expand Down
Loading