This commit is contained in:
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
|
||||
<publishTime>03/14/2019 14:44:18</publishTime>
|
||||
</File>
|
||||
<File Include="bin/App_global.asax.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/App_global.asax.dll">
|
||||
<publishTime>06/14/2017 11:29:54</publishTime>
|
||||
@@ -34,40 +34,40 @@ by editing this MSBuild file. In order to learn more about this please visit htt
|
||||
<publishTime>03/14/2019 14:41:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/clients.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/cmd.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/config.txt">
|
||||
<publishTime>03/22/2019 15:27:40</publishTime>
|
||||
</File>
|
||||
<File Include="bin/CSLA.Core.Bindablebase.dll">
|
||||
<publishTime>10/16/2020 12:31:33</publishTime>
|
||||
<publishTime>10/19/2020 14:30:05</publishTime>
|
||||
</File>
|
||||
<File Include="bin/CSLA.dll">
|
||||
<publishTime>10/16/2020 12:31:36</publishTime>
|
||||
<publishTime>10/19/2020 14:30:06</publishTime>
|
||||
</File>
|
||||
<File Include="bin/CSLA.Server.DataPortal.dll">
|
||||
<publishTime>10/16/2020 12:31:33</publishTime>
|
||||
<publishTime>10/19/2020 14:30:05</publishTime>
|
||||
</File>
|
||||
<File Include="bin/default.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/FirebirdSql.Data.FirebirdClient.dll">
|
||||
<publishTime>03/14/2019 14:42:21</publishTime>
|
||||
</File>
|
||||
<File Include="bin/GZTW.AyaNova.BLL.dll">
|
||||
<publishTime>10/16/2020 12:33:20</publishTime>
|
||||
<publishTime>10/19/2020 14:30:08</publishTime>
|
||||
</File>
|
||||
<File Include="bin/GZTW.AyaNovaMBI.dll">
|
||||
<publishTime>10/16/2020 12:34:04</publishTime>
|
||||
<publishTime>10/19/2020 14:30:40</publishTime>
|
||||
</File>
|
||||
<File Include="bin/GZTW.AyaNovaMBI.Pages.dll">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/GZTW.Data.dll">
|
||||
<publishTime>10/16/2020 12:31:35</publishTime>
|
||||
<publishTime>10/19/2020 14:30:06</publishTime>
|
||||
</File>
|
||||
<File Include="bin/GZTW.MBI.dll">
|
||||
<publishTime>06/14/2017 12:04:42</publishTime>
|
||||
@@ -76,61 +76,61 @@ by editing this MSBuild file. In order to learn more about this please visit htt
|
||||
<publishTime>06/14/2017 11:32:19</publishTime>
|
||||
</File>
|
||||
<File Include="bin/GZTW.Profile.dll">
|
||||
<publishTime>10/16/2020 12:31:33</publishTime>
|
||||
<publishTime>10/19/2020 14:30:05</publishTime>
|
||||
</File>
|
||||
<File Include="bin/labor.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/memoedit.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/memoto.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/Newtonsoft.Json.dll">
|
||||
<publishTime>03/18/2019 11:54:01</publishTime>
|
||||
</File>
|
||||
<File Include="bin/ro.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/sched2labor.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/schedule.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/sign.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="bin/status.aspx.cdcab7d2.compiled">
|
||||
<publishTime>10/16/2020 12:34:19</publishTime>
|
||||
<publishTime>10/19/2020 14:30:56</publishTime>
|
||||
</File>
|
||||
<File Include="clients.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="cmd.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="config.txt">
|
||||
<publishTime>03/22/2019 15:27:40</publishTime>
|
||||
</File>
|
||||
<File Include="default.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="jquery-1.4.4.min.js">
|
||||
<publishTime>03/14/2019 14:44:19</publishTime>
|
||||
</File>
|
||||
<File Include="labor.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="mbi.css">
|
||||
<publishTime>03/14/2019 14:44:19</publishTime>
|
||||
</File>
|
||||
<File Include="memoedit.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="memoto.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="ok.gif">
|
||||
<publishTime>03/14/2019 14:44:19</publishTime>
|
||||
@@ -142,25 +142,25 @@ by editing this MSBuild file. In order to learn more about this please visit htt
|
||||
<publishTime>03/14/2019 14:44:19</publishTime>
|
||||
</File>
|
||||
<File Include="PrecompiledApp.config">
|
||||
<publishTime>10/16/2020 12:34:06</publishTime>
|
||||
<publishTime>10/19/2020 14:30:42</publishTime>
|
||||
</File>
|
||||
<File Include="ro.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="sched2labor.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="schedule.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="sig.js">
|
||||
<publishTime>03/14/2019 14:44:19</publishTime>
|
||||
</File>
|
||||
<File Include="sign.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="status.aspx">
|
||||
<publishTime>10/16/2020 12:34:11</publishTime>
|
||||
<publishTime>10/19/2020 14:30:47</publishTime>
|
||||
</File>
|
||||
<File Include="user.gif">
|
||||
<publishTime>03/14/2019 14:44:18</publishTime>
|
||||
|
||||
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("7.6.0.0")]
|
||||
[assembly: AssemblyFileVersion("7.6.0.0")]
|
||||
[assembly: AssemblyFileVersion("7.6.1.0")]
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
|
||||
<!-- Development test MSSQL DB -->
|
||||
<!-- Development test MSSQL DB
|
||||
<ConnectionType>DataBase</ConnectionType>
|
||||
<DataBaseType>MSSQL</DataBaseType>
|
||||
<DataBaseConnectionString>Server=DEV-V7-LAPTOP\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>
|
||||
-->
|
||||
|
||||
|
||||
|
||||
<!-- DEVELOPMENT embedded Firebird database
|
||||
<!-- DEVELOPMENT embedded Firebird database -->
|
||||
|
||||
<ConnectionType>DataBase</ConnectionType>
|
||||
<DataBaseType>FireBird</DataBaseType>
|
||||
<DataBaseConnectionString>ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3;</DataBaseConnectionString>
|
||||
-->
|
||||
|
||||
|
||||
|
||||
<!-- DataPortal
|
||||
|
||||
@@ -64,4 +64,4 @@ using System.Security.Permissions;
|
||||
// Configure log4net using the .config file
|
||||
//[assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)]
|
||||
//[assembly: log4net.Config.XmlConfigurator( ConfigFile="Log4Net.config",Watch=true )]
|
||||
[assembly: AssemblyFileVersionAttribute("7.6.8.0")]
|
||||
[assembly: AssemblyFileVersionAttribute("7.6.10.0")]
|
||||
|
||||
@@ -116,6 +116,7 @@
|
||||
</Reference>
|
||||
<Reference Include="ChilkatDotNet4">
|
||||
<HintPath>..\..\..\3rdprtylibs\chilkat\ChilkatDotNet4.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.Charts.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
|
||||
@@ -5,24 +5,24 @@ using Chilkat;
|
||||
|
||||
namespace GZTW.AyaNova.BLL
|
||||
{
|
||||
/// <summary>
|
||||
/// Process client notification list and
|
||||
/// deliver appropriately
|
||||
/// </summary>
|
||||
public class GenProcessClientNotifications
|
||||
{
|
||||
private GenProcessClientNotifications()
|
||||
{
|
||||
//
|
||||
// TODO: Add constructor logic here
|
||||
//
|
||||
}
|
||||
/// <summary>
|
||||
/// Process client notification list and
|
||||
/// deliver appropriately
|
||||
/// </summary>
|
||||
public class GenProcessClientNotifications
|
||||
{
|
||||
private GenProcessClientNotifications()
|
||||
{
|
||||
//
|
||||
// TODO: Add constructor logic here
|
||||
//
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Compile a list of all pending Client notifications and deliver them
|
||||
/// </summary>
|
||||
public static void DeliverNotifications()
|
||||
{
|
||||
public static void DeliverNotifications()
|
||||
{
|
||||
//case 1904
|
||||
if (!AyaBizUtils.GlobalSettings.UseNotification) return;
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace GZTW.AyaNova.BLL
|
||||
NotifyDeliveryLog.LogSMTPConnectFailure("Code:" + mailman.LastSmtpStatus.ToString() + "\r\n" + mailman.LastErrorText);
|
||||
|
||||
//If retry then don't proceed or notifications will be deleted
|
||||
if(AyaBizUtils.GlobalSettings.SMTPRetry)
|
||||
if (AyaBizUtils.GlobalSettings.SMTPRetry)
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -68,6 +68,7 @@ namespace GZTW.AyaNova.BLL
|
||||
|
||||
foreach (ClientNotificationList.ClientNotificationListInfo info in nl)
|
||||
{
|
||||
string NotifySummary = string.Empty;
|
||||
try
|
||||
{
|
||||
//reload email from stored mime
|
||||
@@ -93,11 +94,11 @@ namespace GZTW.AyaNova.BLL
|
||||
string ToAddress = sMessageFields[3];
|
||||
|
||||
//case 3808
|
||||
string NotifySummary =string.Empty;
|
||||
|
||||
NotifySummary = ToAddress + "|" + email.Subject;
|
||||
if (nFieldCount > 4)
|
||||
{
|
||||
NotifySummary += "|woid:" + sMessageFields[5];
|
||||
NotifySummary += "|woid:" + sMessageFields[4];//case 3829
|
||||
}
|
||||
if (nFieldCount > 5)
|
||||
{
|
||||
@@ -136,7 +137,7 @@ namespace GZTW.AyaNova.BLL
|
||||
else if (r.ReportKey == "WorkorderQuoteDetailed")
|
||||
o = WorkorderQuoteDetailedReportData.GetItem(woid);
|
||||
|
||||
NotifySummary += "|reportkey:" + r.ReportKey + "|reportid:"+sMessageFields[6];//case 3808
|
||||
NotifySummary += "|reportkey:" + r.ReportKey + "|reportid:" + sMessageFields[6];//case 3808
|
||||
|
||||
//ms.toarray = byte array from memory stream
|
||||
|
||||
@@ -167,12 +168,12 @@ namespace GZTW.AyaNova.BLL
|
||||
success = mailman.SendEmail(email);
|
||||
if (success)
|
||||
{
|
||||
NotifyDeliveryLog.LogClientDelivery(n.ClientID,true,"");
|
||||
NotifyDeliveryLog.LogClientDelivery(n.ClientID, true, "");
|
||||
ClientNotifyEvent.DeleteItem(n.ID);
|
||||
}
|
||||
else
|
||||
{
|
||||
NotifyDeliveryLog.LogClientDelivery(n.ClientID,false, mailman.LastErrorText);
|
||||
NotifyDeliveryLog.LogClientDelivery(n.ClientID, false, mailman.LastErrorText);
|
||||
//Added this late, I'm thinking if it fails they will get the log and
|
||||
//be able to fix the problem easily but if it stays in the queue there will be no way
|
||||
//for them to delete it
|
||||
@@ -181,25 +182,26 @@ namespace GZTW.AyaNova.BLL
|
||||
ClientNotifyEvent.DeleteItem(n.ID);
|
||||
}
|
||||
}
|
||||
catch(Exception ex)
|
||||
{
|
||||
//case 3829
|
||||
catch (Exception ex)
|
||||
{
|
||||
//case 3829
|
||||
|
||||
//crack exception if necessary
|
||||
while (ex.InnerException != null) ex = ex.InnerException;
|
||||
//log and then continue
|
||||
if(string.IsNullOrEmpty(NotifySummary)){
|
||||
NotifySummary="UNKNOWN MESSAGE";
|
||||
}
|
||||
NotifyDeliveryLog.LogSMTPDeliveryMessage("ClientNotify Exception during delivery: Full error is:\r\n" + ex.Message + "\r\nMessage: "+ NotifySummary);
|
||||
//crack exception if necessary
|
||||
while (ex.InnerException != null) ex = ex.InnerException;
|
||||
//log and then continue
|
||||
if (string.IsNullOrEmpty(NotifySummary))
|
||||
{
|
||||
NotifySummary = "UNKNOWN MESSAGE";
|
||||
}
|
||||
NotifyDeliveryLog.LogSMTPDeliveryMessage("ClientNotify Exception during delivery: Full error is:\r\n" + ex.Message + "\r\nMessage: " + NotifySummary);
|
||||
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static string CheckSum(string input)
|
||||
{
|
||||
@@ -214,8 +216,8 @@ namespace GZTW.AyaNova.BLL
|
||||
}
|
||||
|
||||
|
||||
//=================================
|
||||
//=================================
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user