diff --git a/.vs/Fab2ApprovalSystem/FileContentIndex/325e1ae0-e623-481f-b34b-f1d6f7aac7f0.vsidx b/.vs/Fab2ApprovalSystem/FileContentIndex/325e1ae0-e623-481f-b34b-f1d6f7aac7f0.vsidx deleted file mode 100644 index 0a01d93..0000000 Binary files a/.vs/Fab2ApprovalSystem/FileContentIndex/325e1ae0-e623-481f-b34b-f1d6f7aac7f0.vsidx and /dev/null differ diff --git a/.vs/Fab2ApprovalSystem/v17/.suo b/.vs/Fab2ApprovalSystem/v17/.suo index cc69d2d..872dbf5 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/.suo and b/.vs/Fab2ApprovalSystem/v17/.suo differ diff --git a/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog b/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog index 98a881f..c2ca5f9 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog and b/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog differ diff --git a/.vs/Fab2ApprovalSystem/v17/fileList.bin b/.vs/Fab2ApprovalSystem/v17/fileList.bin index f2f2c24..ba12e98 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/fileList.bin and b/.vs/Fab2ApprovalSystem/v17/fileList.bin differ diff --git a/Fab2ApprovalSystem/Controllers/AccountController.cs b/Fab2ApprovalSystem/Controllers/AccountController.cs index cab641b..3b3aae8 100644 --- a/Fab2ApprovalSystem/Controllers/AccountController.cs +++ b/Fab2ApprovalSystem/Controllers/AccountController.cs @@ -123,6 +123,7 @@ namespace Fab2ApprovalSystem.Controllers Session[GlobalVars.SESSION_USERID] = user.UserID; Session[GlobalVars.SESSION_USERNAME] = user.FullName; Session[GlobalVars.IS_ADMIN] = user.IsAdmin; + Session[GlobalVars.IS_MANAGER] = user.IsManager; Session[GlobalVars.OOO] = user.OOO; Session[GlobalVars.CAN_CREATE_PARTS_REQUEST] = user.IsAdmin || PartsRequestController.CanCreatePartsRequest(user.UserID); diff --git a/Fab2ApprovalSystem/Controllers/ManagerController.cs b/Fab2ApprovalSystem/Controllers/ManagerController.cs new file mode 100644 index 0000000..9e9a271 --- /dev/null +++ b/Fab2ApprovalSystem/Controllers/ManagerController.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using Fab2ApprovalSystem.DMO; +using Fab2ApprovalSystem.Misc; + +namespace Fab2ApprovalSystem.Controllers +{ + [Authorize] + [SessionExpireFilter] + public class ManagerController : Controller + { + UserAccountDMO userDMO = new UserAccountDMO(); + AdminDMO adminDMO = new AdminDMO(); + TrainingDMO trainingDMO = new TrainingDMO(); + LotDispositionDMO ldDMO = new LotDispositionDMO(); + + /// + /// + /// + /// + public ActionResult Index() + { + + if ((bool)Session[GlobalVars.IS_MANAGER]) + { + var model = userDMO.GetAllUsers(); + ViewBag.AllActiveUsers = userDMO.GetAllActiveUsers(); + return View(model); + } + else + return Content("Not Autthorized"); + } + } +} diff --git a/Fab2ApprovalSystem/Controllers/TrainingController.cs b/Fab2ApprovalSystem/Controllers/TrainingController.cs index e22e722..eece2b5 100644 --- a/Fab2ApprovalSystem/Controllers/TrainingController.cs +++ b/Fab2ApprovalSystem/Controllers/TrainingController.cs @@ -737,7 +737,7 @@ namespace Fab2ApprovalSystem.Controllers emailBody += "" + assignment.FullName + "" + DateAssigned + ""; if (userDMO.GetUserByID(assignment.UserID).OOO) - emailBody += "X"; + emailBody += "X"; else emailBody += ""; diff --git a/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj b/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj index 8111bb4..18955e8 100644 --- a/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj +++ b/Fab2ApprovalSystem/Fab2ApprovalSystem.csproj @@ -100,6 +100,7 @@ + @@ -1847,6 +1848,8 @@ + + diff --git a/Fab2ApprovalSystem/Misc/GlobalVars.cs b/Fab2ApprovalSystem/Misc/GlobalVars.cs index 6b76b25..7c7c074 100644 --- a/Fab2ApprovalSystem/Misc/GlobalVars.cs +++ b/Fab2ApprovalSystem/Misc/GlobalVars.cs @@ -14,6 +14,7 @@ namespace Fab2ApprovalSystem.Misc public const string SESSION_USERID = "UserID"; public const string ECN_VIEW_OPTION = "ECN_ViewOption"; public const string IS_ADMIN = "IsAdmin"; + public const string IS_MANAGER = "IsManager"; public const string OOO = "OOO"; public const string SUCCESS = "Success"; public const string CAN_CREATE_PARTS_REQUEST = "CanCreatePartsRequest"; diff --git a/Fab2ApprovalSystem/Models/AccountViewModels.cs b/Fab2ApprovalSystem/Models/AccountViewModels.cs index 819ad9e..5b5d0ba 100644 --- a/Fab2ApprovalSystem/Models/AccountViewModels.cs +++ b/Fab2ApprovalSystem/Models/AccountViewModels.cs @@ -23,6 +23,7 @@ namespace Fab2ApprovalSystem.Models public string FullName { get; set; } public bool IsAdmin { get; set; } + public bool IsManager { get; set; } public bool IsActive { get; set; } public DateTime? LastLogin { get; set; } diff --git a/Fab2ApprovalSystem/Views/Admin/Index.cshtml b/Fab2ApprovalSystem/Views/Admin/Index.cshtml index 0fb22f5..57912d4 100644 --- a/Fab2ApprovalSystem/Views/Admin/Index.cshtml +++ b/Fab2ApprovalSystem/Views/Admin/Index.cshtml @@ -44,7 +44,7 @@ columns.Bound(l => l.IsActive); //columns.Template(@).ClientTemplate(""); columns.Bound(l => l.IsAdmin); - + columns.Bound(l => l.IsManager); columns.Bound(l => l.LastLogin).Format("{0:MM/dd/yy hh:mm:ss}"); diff --git a/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml b/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml index 2952255..b8effd2 100644 --- a/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml +++ b/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml @@ -352,7 +352,7 @@ model.Id(p => p.ID); }) .PageSize(50) - .Read(read => read.Action("Attach_Read", "CorrectiveAction", new { caNO = Model.CANo })) + .Read(read => read.Action("Attachment_Read", "CorrectiveAction", new { caNO = Model.CANo })) ) ) diff --git a/Fab2ApprovalSystem/Views/Home/Index.cshtml b/Fab2ApprovalSystem/Views/Home/Index.cshtml index dee6f4b..0fe2aae 100644 --- a/Fab2ApprovalSystem/Views/Home/Index.cshtml +++ b/Fab2ApprovalSystem/Views/Home/Index.cshtml @@ -305,20 +305,6 @@
-
-
-
-
-
- - -
-
-
-
-
-
-
@@ -513,15 +499,8 @@ $('#SaveOOOInfo').on('click', function () { var tab = $('#currentTab').val(); var bfound = false; - var delegate = ""; - var checkbox = $('#AddDelegate').is(":checked"); - - if (checkbox === true) { - delegate = $("#DelegateTo").data("kendoDropDownList").value(); - } - - if (userid == delegate) { + if (userid == $("#DelegateTo").data("kendoDropDownList").value()) { alert('The OOO person cannot be same as the delegate to person'); return false; } @@ -603,15 +582,6 @@ //grid.removeRow($(element)); } - function toggleDelegate() { - var control = document.getElementById("DelegateControl"); - var label = document.getElementById("DelegateLabel"); - - control.classList.toggle("hideControl"); - label.classList.toggle("hideControl"); - } - - function showReAssignRole(_pendingApprovers, _closeDate, _issueID, _docType, _submitDate) { //alert(_closeDate);; //alert(_pendingApprovers); diff --git a/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml b/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml index 3d963bd..688ca94 100644 --- a/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml +++ b/Fab2ApprovalSystem/Views/Home/_HomeLayout.cshtml @@ -148,7 +148,6 @@
-
@@ -217,12 +216,12 @@
@*
-
-
- -
-
-
*@ +
+
+ +
+
+
*@
@@ -313,7 +312,6 @@ return false; }) - $('#SaveOOOInfo').on('click', function () { var tab = $('#currentTab').val(); var bfound = false; diff --git a/Fab2ApprovalSystem/Views/Manager/Index.cshtml b/Fab2ApprovalSystem/Views/Manager/Index.cshtml new file mode 100644 index 0000000..de4ec07 --- /dev/null +++ b/Fab2ApprovalSystem/Views/Manager/Index.cshtml @@ -0,0 +1,594 @@ +@model IEnumerable + +@{ + ViewBag.Title = "Index"; +} + +@{ + Layout = "_ManagerLayout.cshtml"; +} + + + + + + +
+ @(Html.Kendo().Grid() + .Name("userList") + .Columns(columns => + { + columns.Bound(l => l.UserID).Visible(false); + columns.Bound(l => l.FirstName); + columns.Bound(l => l.LastName); + columns.Bound(l => l.Email); + columns.Bound(l => l.IsActive); + //columns.Template(@).ClientTemplate(""); + + columns.Bound(l => l.LastLogin).Format("{0:MM/dd/yy hh:mm:ss}"); + + // columns.Command(command => { command.Edit(); command.Destroy(); }).Width("200px"); + + + columns.Bound(l => l.OOO); + columns.Bound(l => l.OOOStartDate).Format("{0:MM/dd/yy hh:mm:ss}").Width("150px"); + columns.Bound(l => l.OOOExpirationDate).Format("{0:MM/dd/yy hh:mm:ss}").Width("150px"); + columns.Bound(l => l.DelegatedTo).Visible(false); + columns.Bound(l => l.DelegatedToFullName); + columns.Bound(p => p.OOOStatusWithUserID).ClientTemplate("#=buildButtons(OOOStatusWithUserID)#").Width(120); + //columns.Template(p => { }).HeaderTemplate("").ClientTemplate(@" + //"); + }) + .HtmlAttributes(new { style = "height: 500px;" }) + .Scrollable() + .Resizable(resize => resize.Columns(true)) + .Groupable() + .Sortable() + .Filterable() + .Pageable(pageable => pageable + .Refresh(true) + .PageSizes(true) + .ButtonCount(5)) + .DataSource(dataSource => dataSource + + .Ajax().ServerOperation(false) + .Events(events => events.Error("error_handler")) + .Model(model => + { + model.Id(l => l.UserID); + model.Field(p => p.UserID).Editable(false); + model.Field(l => l.LastLogin).Editable(false); + model.Field(l => l.OOO).Editable(false); + model.Field(l => l.OOOStartDate).Editable(false); + model.Field(l => l.OOOExpirationDate).Editable(false); + model.Field(l => l.DelegatedToFullName).Editable(false); + + + }) + .PageSize(50) + .Read(read => read.Action("GetGridUserList", "Admin")) + + ) + + ) + @*@(Html.Kendo().Grid() + .Name("Grid") + .Columns(columns => + { + columns.Bound(l => l.UserID).Visible(false); + columns.Bound(l => l.LoginID); + columns.Bound(l => l.FirstName); + columns.Bound(l => l.LastName); + columns.Bound(l => l.IsAdmin); + columns.Bound(l => l.LastLogin).Format("{0:MM/dd/yy hh:mm:ss}"); + columns.Bound(l => l.OOO); + columns.Bound(l => l.OOOStartDate).Format("{0:MM/dd/yy hh:mm:ss}").Width("150px"); + columns.Bound(l => l.OOOExpirationDate).Format("{0:MM/dd/yy hh:mm:ss}").Width("150px"); + columns.Bound(l => l.DelegatedTo).Visible(false); + columns.Bound(l => l.DelegatedToFullName); + columns.Bound(p => p.OOOStatusWithUserID).ClientTemplate("#=buildButtons(OOOStatusWithUserID)#").Width(120); + + + }) + .ToolBar(toolbar => + { + toolbar.Create(); + toolbar.Save(); + }) + .Editable(editable => editable.Mode(GridEditMode.InCell)) + .Pageable() + .Navigatable() + .Sortable() + .Scrollable() + .DataSource(dataSource => dataSource + .Ajax() + .Batch(true) + .PageSize(20) + .ServerOperation(false) + //.Events(events => events.Error("error_handler")) + .Model(model => model.Id(p => p.UserID)) + .Read(read => read.Action("GetGridUserList", "Admin")) + .Create(update => update.Action("InsertUser", "Admin")) + .Update(update => update.Action("BatchUpdateUser", "Admin")) + .Destroy(destroy => destroy.Action("DeleteUser", "Admin")) + ) + )*@ + + +
+ + + diff --git a/Fab2ApprovalSystem/Views/Manager/_ManagerLayout.cshtml b/Fab2ApprovalSystem/Views/Manager/_ManagerLayout.cshtml new file mode 100644 index 0000000..eabf02c --- /dev/null +++ b/Fab2ApprovalSystem/Views/Manager/_ManagerLayout.cshtml @@ -0,0 +1,65 @@ + + + + + + + @ViewBag.Title - Mesa Approval + @Styles.Render("~/Content/kendo/css") + @Styles.Render("~/Content/css") + @*@Styles.Render("~/Content/jqw/css")*@ + + + @Scripts.Render("~/bundles/modernizr") + @Scripts.Render("~/bundles/jquery") + @Scripts.Render("~/bundles/kendo") + + + @* + *@ + @Scripts.Render("~/bundles/bootstrap") + @*@Scripts.Render("~/Content/jqw/jq")*@ + + + + + +
+
+
+ @if (Request.IsAuthenticated) { + @*@Html.ActionLink("Home", "Index", "Home", new { tabName = "MyTasks" }, new { @class = "navbar-brand" })*@ + @Html.ActionLink("Home", "MyTasks", "Home", null, new { @class = "navbar-brand" }) + } +
+
+
    + @if ((bool)@Session[GlobalVars.IS_ADMIN]) + { +
  • @Html.ActionLink("Admin", "Index", "Admin")
    • + } +
+ @Html.Partial("_LoginPartial") +
+
+
+ @(Html.Kendo().Menu() + .Name("menu") + .HtmlAttributes(new { style = "width:100%; font-size: 12px" }) + .Items(menu => + { + menu.Add().Text("Manage Users").Action("Index", "Manager"); + })) +
+ @RenderBody() + @*
*@ + +
+ + + + @RenderSection("scripts", required: false) + +