Moved System.IO references from DMO classes to Static Helpers
Removed nugetSource from pipeline Removed more comments Created Static Classes for most DMO / Controller Classes Push ConfigurationManager.AppSettings to controller Align Tests with other Projects
This commit is contained in:
@ -1,16 +1,16 @@
|
||||
using Fab2ApprovalSystem.DMO;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
|
||||
using Fab2ApprovalSystem.DMO;
|
||||
using Fab2ApprovalSystem.Misc;
|
||||
using Fab2ApprovalSystem.Models;
|
||||
|
||||
using Kendo.Mvc.Extensions;
|
||||
using Kendo.Mvc.UI;
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Fab2ApprovalSystem.Controllers;
|
||||
|
||||
[Authorize]
|
||||
@ -20,15 +20,13 @@ public class PartsRequestController : Controller {
|
||||
|
||||
|
||||
const int WorkflowNumber = 1;
|
||||
PartsRequestDMO prDMO;
|
||||
PartsRequestDMO prDMO = new PartsRequestDMO();
|
||||
UserAccountDMO userDMO = new UserAccountDMO();
|
||||
WorkflowDMO wfDMO = new WorkflowDMO();
|
||||
private readonly AppSettings _AppSettings;
|
||||
private readonly AppSettings _AppSettings = GlobalVars.AppSettings;
|
||||
|
||||
public PartsRequestController(AppSettings appSettings) {
|
||||
_AppSettings = appSettings;
|
||||
public PartsRequestController() {
|
||||
ViewBag.ShowReAssignApprovers = false;
|
||||
prDMO = new PartsRequestDMO(appSettings);
|
||||
}
|
||||
|
||||
protected ActionResult HandleValidationError(string msg) {
|
||||
@ -248,7 +246,7 @@ public class PartsRequestController : Controller {
|
||||
if (files != null) {
|
||||
int userId = (int)Session[GlobalVars.SESSION_USERID];
|
||||
foreach (var file in files) {
|
||||
prDMO.AttachSave(prNumber, userId, file.FileName, file.InputStream);
|
||||
PartsRequestHelper.AttachSave(_AppSettings, prDMO, prNumber, userId, file.FileName, file.InputStream);
|
||||
}
|
||||
}
|
||||
|
||||
@ -419,28 +417,14 @@ public class PartsRequestController : Controller {
|
||||
}
|
||||
}
|
||||
|
||||
protected void SendEmailNotification(string subject, int prNumber, string toEmail, string emailTemplate) {
|
||||
string senderName = "Parts Request";
|
||||
|
||||
EmailNotification en = new EmailNotification(_AppSettings, subject, System.Configuration.ConfigurationManager.AppSettings["EmailTemplatesPath"]);
|
||||
string[] emailparams = new string[5];
|
||||
emailparams[0] = prNumber.ToString();
|
||||
emailparams[1] = prNumber.ToString();
|
||||
emailparams[2] = GlobalVars.hostURL;
|
||||
emailparams[3] = "Parts Request";
|
||||
emailparams[4] = Session[GlobalVars.SESSION_USERNAME].ToString();
|
||||
String userEmail = toEmail;
|
||||
|
||||
en.SendNotificationEmail(emailTemplate, GlobalVars.SENDER_EMAIL, senderName, userEmail, null, subject, emailparams);
|
||||
}
|
||||
|
||||
protected void NotifyReAssignment(int prNumber, string email) {
|
||||
var pr = prDMO.Get(prNumber);
|
||||
|
||||
if (pr == null)
|
||||
return;
|
||||
|
||||
SendEmailNotification(
|
||||
string username = Session[GlobalVars.SESSION_USERNAME].ToString();
|
||||
PartsRequestHelper.SendEmailNotification(_AppSettings, username,
|
||||
subject: String.Format("Parts Request Re-Assignment notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: email,
|
||||
@ -463,11 +447,12 @@ public class PartsRequestController : Controller {
|
||||
|
||||
var u = userDMO.GetUserByID(pr.RequestorID);
|
||||
if ((u != null) && (!String.IsNullOrWhiteSpace(u.Email))) {
|
||||
SendEmailNotification(
|
||||
subject: String.Format("Parts Request Completion notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: u.Email,
|
||||
emailTemplate: "PRCompleted.txt");
|
||||
string username = Session[GlobalVars.SESSION_USERNAME].ToString();
|
||||
PartsRequestHelper.SendEmailNotification(_AppSettings, username,
|
||||
subject: String.Format("Parts Request Completion notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: u.Email,
|
||||
emailTemplate: "PRCompleted.txt");
|
||||
|
||||
EventLogDMO.Add(new WinEventLog() {
|
||||
IssueID = prNumber,
|
||||
@ -487,11 +472,12 @@ public class PartsRequestController : Controller {
|
||||
|
||||
var u = userDMO.GetUserByID(pr.OriginatorID);
|
||||
if ((u != null) && (!String.IsNullOrWhiteSpace(u.Email))) {
|
||||
SendEmailNotification(
|
||||
subject: String.Format("Parts Request Rejection notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: u.Email,
|
||||
emailTemplate: "PRReject.txt");
|
||||
string username = Session[GlobalVars.SESSION_USERNAME].ToString();
|
||||
PartsRequestHelper.SendEmailNotification(_AppSettings, username,
|
||||
subject: String.Format("Parts Request Rejection notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: u.Email,
|
||||
emailTemplate: "PRReject.txt");
|
||||
|
||||
EventLogDMO.Add(new WinEventLog() {
|
||||
IssueID = prNumber,
|
||||
@ -517,11 +503,12 @@ public class PartsRequestController : Controller {
|
||||
|
||||
foreach (string email in emailList) {
|
||||
try {
|
||||
SendEmailNotification(
|
||||
subject: String.Format("Parts Request Assignment notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: email,
|
||||
emailTemplate: "PRAssigned.txt");
|
||||
string username = Session[GlobalVars.SESSION_USERNAME].ToString();
|
||||
PartsRequestHelper.SendEmailNotification(_AppSettings, username,
|
||||
subject: String.Format("Parts Request Assignment notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: email,
|
||||
emailTemplate: "PRAssigned.txt");
|
||||
} catch (Exception ex) {
|
||||
HandleException(prNumber, ex, "email=" + email);
|
||||
}
|
||||
@ -569,7 +556,8 @@ public class PartsRequestController : Controller {
|
||||
if (pr == null)
|
||||
return;
|
||||
|
||||
SendEmailNotification(
|
||||
string username = Session[GlobalVars.SESSION_USERNAME].ToString();
|
||||
PartsRequestHelper.SendEmailNotification(_AppSettings, username,
|
||||
subject: String.Format("Parts Request Assignment notice for # {0} - {1}", pr.PRNumber, pr.Title),
|
||||
prNumber: prNumber,
|
||||
toEmail: email,
|
||||
|
Reference in New Issue
Block a user