Skip to content

Commit

Permalink
Updated to Alpha 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@speckis
speckis committed Nov 17, 2015
1 parent e8c0e98 commit 35bf232
Show file tree
Hide file tree
Showing 21 changed files with 300 additions and 209 deletions.
Binary file modified TimmApp/App_Data/DefaultConnection.mdf
View file
Binary file not shown.
Binary file modified TimmApp/App_Data/DefaultConnection_log.ldf
View file
Binary file not shown.
Binary file modified TimmApp/App_Data/TimmDbContext.mdf
View file
Binary file not shown.
Binary file modified TimmApp/App_Data/TimmDbContext_log.ldf
View file
Binary file not shown.
72 changes: 46 additions & 26 deletions TimmApp/Content/Site.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,27 @@ input[type="checkbox"].input-validation-error {
.panel {
padding: 20px;
width: 17em;
box-shadow: 5px 4px 7px -3px #0C0E0C;
/*box-shadow: 5px 4px 7px -3px #0C0E0C;*/
}

.panel-first {
border: 2px solid #1D5046;
background: #2D326B;
color: #fff;
}

.panel-second {
border: 2px solid #b42323;
background: #D6820C;
color: #fff;
}

.panel-third {
border: 2px solid #528342;
background: #1D5046;
color: #fff;
}

.panel-fourth {
border: 2px solid #b94a48;
background: #9D3123;
color: #fff;
}

.navbar-inverse {
Expand All @@ -75,15 +79,15 @@ input[type="checkbox"].input-validation-error {
}

.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus {
color: #b42323;
color: #B86E7A;
}

.navbar-inverse .navbar-brand {
color: #0A6114;
}

.navbar-inverse .navbar-brand:hover {
color: #b42323;
color: #B86E7A;
}

.btn {
Expand All @@ -95,7 +99,6 @@ input[type="checkbox"].input-validation-error {

h2, .h2 {
color: #fff;
margin-left: 46px;
}

.startContainer {
Expand All @@ -114,78 +117,74 @@ h2, .h2 {
box-shadow: inset 0px 2px 16px -1px #0A6114;*/
}

.btn-blue {
background: #326259;
.btn-green {
background: #1D5046;
width: 9em;
height: 5em;
padding: 42px 26px 0px 20px;
font-size: 23px;
color: #fff;
color: #44A390;
line-height: normal;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
}

.btn-blue:hover {
background: #1D5046;
.btn-green:hover {
color: #fff;

}

.btn-brown {
background: #9A6C4E;
background: #2D5520;
width: 9em;
height: 5em;
padding: 42px 26px 0px 20px;
font-size: 23px;
color: #fff;
color: #85AA79;
line-height: normal;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
}

.btn-brown:hover {
background: #7D4D2D;
color: #fff;

}

.btn-green {
background: #528342;
.btn-blue {
background: #222648;
width: 9em;
height: 5em;
padding: 42px 26px 0px 20px;
font-size: 23px;
color: #fff;
color: #6C708E;
line-height: normal;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
}

.btn-green:hover {
background: #366A26;
.btn-blue:hover {
color: #fff;

}

.btn-purple {
background: #934B53;
background: #5A151F;
width: 9em;
height: 5em;
padding: 42px 26px 0px 20px;
font-size: 23px;
color: #fff;
color: #B86E7A;
line-height: normal;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
}

.btn-purple:hover {
background: #772B35;
color: #fff;

}
Expand All @@ -209,7 +208,7 @@ h2, .h2 {
}

.jumbotron {
margin-left: 300px;
margin-left: 230px;
background: #C5DDBD;
}

Expand All @@ -228,4 +227,25 @@ h2, .h2 {

.control-label {
font-size: 7px;
}
}


.listView {
color: #44A390;
font-size: 1.2em;
font-weight: normal;
width: 14em;
}

.listView, td, a {
text-decoration: none !important;
color: #44A390;
}

.listView, td, a:hover {
color: #44A390;
}

.td {
border-top: none;
}
2 changes: 1 addition & 1 deletion TimmApp/Content/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@ th {
padding: 8px;
line-height: 1.428571429;
vertical-align: top;
border-top: 1px solid #dddddd;
border-top: none;
}

.table thead > tr > th {
Expand Down
36 changes: 18 additions & 18 deletions TimmApp/Content/calendar_green.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.calendar_green_main
{
border: 1px solid #999;
/*border: 1px solid #999;*/
}

.calendar_green_colheader
Expand All @@ -16,7 +16,7 @@
left: 0px;
bottom: 0px;
right: 0px;
border-bottom: 1px solid #999;
/*border-bottom: 1px solid #999;*/

color: #666;
background: #666;
Expand Down Expand Up @@ -45,19 +45,19 @@
left: 0px;
bottom: 0px;
right: 0px;
border-right: 1px solid #999;
border-bottom: 1px solid #999;
/*border-right: 1px solid #999;
border-bottom: 1px solid #999;*/

color: #ffffff;
background: #666;
background: -moz-linear-gradient(
top,
#777 0%,
#666);
#405F36 0%,
#405F36);
background: -webkit-gradient(
linear, left top, left bottom,
from(#777),
to(#666));
from(#405F36),
to(#405F36));
filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#777777", endColorStr="#666666");
text-shadow:
0px -1px 1px rgba(000,000,000,0.2),
Expand Down Expand Up @@ -108,19 +108,19 @@
left: 0px;
bottom: 0px;
right: 0px;
border-right: 1px solid #999;
border-bottom: 1px solid #999;
/*border-right: 1px solid #999;
border-bottom: 1px solid #999;*/

color: #ffffff;
background: #666;
background: #618854;
background: -moz-linear-gradient(
top,
#777 0%,
#666);
background: -webkit-gradient(
linear, left top, left bottom,
from(#777),
to(#666));
from(#405F36),
to(#405F36));
filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#777777", endColorStr="#666666");
text-shadow:
0px -1px 1px rgba(000,000,000,0.2),
Expand Down Expand Up @@ -217,8 +217,8 @@
#8aaa00);
background: -webkit-gradient(
linear, left top, left bottom,
from(#a2c200),
to(#8aaa00));
from(#618854),
to(#618854));
filter: progid:DXImageTransform.Microsoft.Gradient(startColorStr="#a2c200", endColorStr="#8aaa00");
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
Expand Down Expand Up @@ -292,8 +292,8 @@
bottom: 4px;
left: 6px;
width: 2px;
background-color: #C0D46A;
background-color: #C7D48D;
background-color: #618854;
background-color: #618854;
}

.calendar_green_event_bar_inner
Expand All @@ -320,7 +320,7 @@

.calendar_green_shadow_inner
{
background-color: #666666;
background-color: #618854;
opacity: 0.5;
filter: alpha(opacity=50);
height: 100%;
Expand Down
Binary file added TimmApp/Content/images/logofinal.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added TimmApp/Content/images/reallogo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion TimmApp/Controllers/EmployeeController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public ActionResult Details(int? id)
{
return HttpNotFound();
}
return Json(JsonResponseFactory.SuccessResponse(employee), JsonRequestBehavior.AllowGet);
return View(employee);
//return Json(JsonResponseFactory.SuccessResponse(employee), JsonRequestBehavior.AllowGet);
}

// GET: /Employee/Create
Expand All @@ -56,6 +57,7 @@ public ActionResult Create([Bind(Include="EmployeeId,Fname,Lname,PhoneNum,Email,
}

return View(employee);

}

// GET: /Employee/Edit/5
Expand Down
3 changes: 2 additions & 1 deletion TimmApp/Controllers/EventController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ protected override void OnInit(InitArgs e)

protected override void OnEventResize(EventResizeArgs e)
{
var toBeResized = (from ev in db.events where ev.id == Convert.ToInt32(e.Id) select ev).First();
var id = Convert.ToInt32(e.Id);
var toBeResized = (from ev in db.events where ev.id == id select ev).First();
toBeResized.eventStart = e.NewStart;
toBeResized.eventEnd = e.NewEnd;
db.SaveChanges();
Expand Down
2 changes: 2 additions & 0 deletions TimmApp/Models/Employee.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ public class Employee

[Required]
[Display(Name = "Contract sign date")]
[DisplayFormat(DataFormatString="{0:dd/MM/yyyy}")]
public DateTime ContractStartDate { get; set; }

[Required]
[Display(Name = "Contract ends")]
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}")]
public DateTime ContractEndDate { get; set; }
}

Expand Down
Loading

0 comments on commit 35bf232

Please sign in to comment.