admin/rockfish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exclude inactive customers from email address list for selected product codes report

Browse Source
This commit is contained in:
John Cardinal
2022-06-07 23:10:52 +00:00
parent d39909bb9d
commit f9784d0b0d
4 changed files with 79 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Controllers/ReportController.cs
View File

@@ -71,7 +71,7 @@ namespace rockfishCore.Controllers
[HttpPost("emailsforproductcodes")]
public JsonResult GetUniqueEmailsByProductCodes([FromBody] requestEmailsForProductCodes req)
{
var customerList = _context.Customer.Select(p => new { p.Id, p.DoNotContact });
var customerList = _context.Customer.Select(p => new { p.Id, p.DoNotContact, p.Active });
List<long> rawCustomerIds = new List<long>();
@@ -88,10 +88,26 @@ namespace rockfishCore.Controllers
//container for the raw email lists built serially
List<string> rawEmails = new List<string>();
/*
Test for QBI and renewal with version 6.13 before new code to remove non active's:
mikem@alpine-optics.com,yamilef@alpine-optics.com,davidb@alpine-optics.com,eli@data-serv.com,jasonc@energycontrol.com,renah@energycontrol.com,nmizrahi@energycontrol.com,sherri@entryguardsystems.com,
error@error-cr.com,bfairman@fairmanassociates.com,info@fouralarm.ca,scott@fouralarm.ca,angela@fouralarm.ca,matt.levis0@gmail.com,hartcomputersme@gmail.com,steve@grafixsolutions.net,
spasandleisure@hotmail.com,service@intermedex.com,bos@iss-central.com,ronkingmail2@netscape.net,fernando@pegasusind.com,admin@pegasusind.com,jdragan@pro-ees.com,imcleod@redskye.co.uk,
amcleod@redskye.co.uk,rena@sensorfact.com,sales@solveit.ie,austin@solveit.ie,ericg@straighttalktech.com,shootnsharp@thesoileaus.com,skyliner575600@yahoo.com,chad@zapmgames.com
After these changes:
mikem@alpine-optics.com,yamilef@alpine-optics.com,davidb@alpine-optics.com,eli@data-serv.com,sherri@entryguardsystems.com,bfairman@fairmanassociates.com,info@fouralarm.ca,scott@fouralarm.ca,
angela@fouralarm.ca,matt.levis0@gmail.com,hartcomputersme@gmail.com,steve@grafixsolutions.net,spasandleisure@hotmail.com,service@intermedex.com,bos@iss-central.com,ronkingmail2@netscape.net,
fernando@pegasusind.com,admin@pegasusind.com,jdragan@pro-ees.com,imcleod@redskye.co.uk,amcleod@redskye.co.uk,shootnsharp@thesoileaus.com,skyliner575600@yahoo.com,chad@zapmgames.com
*/
foreach (long cid in uniqueCustomerIds)
{
//skip if do not contact and not explicitly including do not contact
if (customerList.First(p => p.Id == cid).DoNotContact && req.ckNoContact != true)
//get customer record
var customerRecord=customerList.First(p => p.Id == cid);
//skip if not present, not active or do not contact and not explicitly including do not contact
if (customerRecord==null || customerRecord.Active==false ||( customerRecord.DoNotContact && req.ckNoContact != true))
continue;
//get all raw email values for this client from db

4
notes/deploy.txt
View File

@@ -28,7 +28,9 @@ in rockfish.last to copy over all current rockfish files and folders:
root@ubuntu-s-1vcpu-1gb-amd-sfo3-01:/srv/coreapps/rockfish.last# cp -a ../rockfish/. .
2.9) delete all in rockfish folder except db folder
2.9) delete all in rockfish folder except db folder AND ** JSON CONFIG FILES **
If it won't start it's likely the .json config files are not present, copy back from rockfish.last
3) COPY
Copy over to production server, safest is all files from publish into /srv/coreapps/rockfish

2
util/RfVersion.cs
View File

@@ -2,7 +2,7 @@ namespace rockfishCore.Util
{
public static class RfVersion
{
public const string NumberOnly="6.13";
public const string NumberOnly="6.14";
public const string Full = "Rockfish server " + NumberOnly;
}
}

112
wwwroot/default.htm
View File

@@ -11,73 +11,73 @@
<title>Rockfish loading....</title>
<!-- ICONS / MANIFEST -->
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.13">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.13">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.13">
<link rel="manifest" href="/manifest.json?rfv=6.13">
<link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.13" color="#5bbad5">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.14">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.14">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.14">
<link rel="manifest" href="/manifest.json?rfv=6.14">
<link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.14" color="#5bbad5">
<meta name="theme-color" content="#ffffff">
<!-- 3rd party components fonts and icons -->
<link href="css/materialdesignicons.min.css?rfv=6.13" media="all" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.13" type="text/css" />
<link rel="stylesheet" href="css/app.css?rfv=6.13" type="text/css" />
<link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.13" type="text/css" />
<link href="css/materialdesignicons.min.css?rfv=6.14" media="all" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.14" type="text/css" />
<link rel="stylesheet" href="css/app.css?rfv=6.14" type="text/css" />
<link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.14" type="text/css" />
<!-- third-party javascript -->
<script src="js/lib/jquery-3.3.1.min.js?rfv=6.13"></script>
<script src="js/lib/page.js?rfv=6.13"></script>
<script src="js/lib/jquery.event.gevent.js?rfv=6.13"></script>
<script src="js/lib/jquery.gzserialize.js?rfv=6.13"></script>
<script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.13"></script>
<script src="js/lib/store.min.js?rfv=6.13"></script>
<script src="js/lib/jquery.autocomplete.min.js?rfv=6.13"></script>
<script src="js/lib/moment.min.js?rfv=6.13"></script>
<script src="js/lib/jquery-3.3.1.min.js?rfv=6.14"></script>
<script src="js/lib/page.js?rfv=6.14"></script>
<script src="js/lib/jquery.event.gevent.js?rfv=6.14"></script>
<script src="js/lib/jquery.gzserialize.js?rfv=6.14"></script>
<script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.14"></script>
<script src="js/lib/store.min.js?rfv=6.14"></script>
<script src="js/lib/jquery.autocomplete.min.js?rfv=6.14"></script>
<script src="js/lib/moment.min.js?rfv=6.14"></script>
<!-- our javascript -->
<script src="js/index.js?rfv=6.13"></script>
<script src="js/app.util.js?rfv=6.13"></script>
<script src="js/app.api.js?rfv=6.13"></script>
<script src="js/app.utilB.js?rfv=6.13"></script>
<script src="js/app.nav.js?rfv=6.13"></script>
<script src="js/app.shell.js?rfv=6.13"></script>
<script src="js/app.fourohfour.js?rfv=6.13"></script>
<script src="js/app.authenticate.js?rfv=6.13"></script>
<script src="js/app.customers.js?rfv=6.13"></script>
<script src="js/app.customerEdit.js?rfv=6.13"></script>
<script src="js/app.customerSites.js?rfv=6.13"></script>
<script src="js/app.customerSiteEdit.js?rfv=6.13"></script>
<script src="js/app.purchases.js?rfv=6.13"></script>
<script src="js/app.purchaseEdit.js?rfv=6.13"></script>
<script src="js/app.license.js?rfv=6.13"></script>
<script src="js/app.licenseTemplates.js?rfv=6.13"></script>
<script src="js/app.licenseRequestEdit.js?rfv=6.13"></script>
<script src="js/app.licenses.js?rfv=6.13"></script>
<script src="js/app.licenseView.js?rfv=6.13"></script>
<script src="js/app.reportData.js?rfv=6.13"></script>
<script src="js/app.reportDataProdEmail.js?rfv=6.13"></script>
<script src="js/app.reportDataExpires.js?rfv=6.13"></script>
<script src="js/app.search.js?rfv=6.13"></script>
<script src="js/app.subscription.js?rfv=6.13"></script>
<script src="js/app.subnotify.js?rfv=6.13"></script>
<script src="js/app.templates.js?rfv=6.13"></script>
<script src="js/app.templateEdit.js?rfv=6.13"></script>
<script src="js/app.inbox.js?rfv=6.13"></script>
<script src="js/app.mailEdit.js?rfv=6.13"></script>
<script src="js/app.rfcaseEdit.js?rfv=6.13"></script>
<script src="js/app.rfcases.js?rfv=6.13"></script>
<script src="js/app.rfsettings.js?rfv=6.13"></script>
<script src="js/app.ops.js?rfv=6.13"></script>
<script src="js/app.trials.js?rfv=6.13"></script>
<script src="js/app.trialEdit.js?rfv=6.13"></script>
<script src="js/app.ravLicenses.js?rfv=6.13"></script>
<script src="js/app.ravLicense.js?rfv=6.13"></script>
<script src="js/index.js?rfv=6.14"></script>
<script src="js/app.util.js?rfv=6.14"></script>
<script src="js/app.api.js?rfv=6.14"></script>
<script src="js/app.utilB.js?rfv=6.14"></script>
<script src="js/app.nav.js?rfv=6.14"></script>
<script src="js/app.shell.js?rfv=6.14"></script>
<script src="js/app.fourohfour.js?rfv=6.14"></script>
<script src="js/app.authenticate.js?rfv=6.14"></script>
<script src="js/app.customers.js?rfv=6.14"></script>
<script src="js/app.customerEdit.js?rfv=6.14"></script>
<script src="js/app.customerSites.js?rfv=6.14"></script>
<script src="js/app.customerSiteEdit.js?rfv=6.14"></script>
<script src="js/app.purchases.js?rfv=6.14"></script>
<script src="js/app.purchaseEdit.js?rfv=6.14"></script>
<script src="js/app.license.js?rfv=6.14"></script>
<script src="js/app.licenseTemplates.js?rfv=6.14"></script>
<script src="js/app.licenseRequestEdit.js?rfv=6.14"></script>
<script src="js/app.licenses.js?rfv=6.14"></script>
<script src="js/app.licenseView.js?rfv=6.14"></script>
<script src="js/app.reportData.js?rfv=6.14"></script>
<script src="js/app.reportDataProdEmail.js?rfv=6.14"></script>
<script src="js/app.reportDataExpires.js?rfv=6.14"></script>
<script src="js/app.search.js?rfv=6.14"></script>
<script src="js/app.subscription.js?rfv=6.14"></script>
<script src="js/app.subnotify.js?rfv=6.14"></script>
<script src="js/app.templates.js?rfv=6.14"></script>
<script src="js/app.templateEdit.js?rfv=6.14"></script>
<script src="js/app.inbox.js?rfv=6.14"></script>
<script src="js/app.mailEdit.js?rfv=6.14"></script>
<script src="js/app.rfcaseEdit.js?rfv=6.14"></script>
<script src="js/app.rfcases.js?rfv=6.14"></script>
<script src="js/app.rfsettings.js?rfv=6.14"></script>
<script src="js/app.ops.js?rfv=6.14"></script>
<script src="js/app.trials.js?rfv=6.14"></script>
<script src="js/app.trialEdit.js?rfv=6.14"></script>
<script src="js/app.ravLicenses.js?rfv=6.14"></script>
<script src="js/app.ravLicense.js?rfv=6.14"></script>
<!-- handlebars templates -->
<script src="js/templates/templates.js?rfv=6.13"></script>
<script src="js/templates/templates.js?rfv=6.14"></script>
<script>
@@ -107,7 +107,7 @@ window.onerror = function ( error ) {
<body class="rf-body">
<div id="app" class="container"></div>
<script src="js/lib/bootstrap.min.js?rfv=6.13"></script>
<script src="js/lib/bootstrap.min.js?rfv=6.14"></script>
</body>
</html>