Changeset 1275

Timestamp:

1/28/2010 7:48:10 AM (7 weeks ago)

Author:

vessper

Message:

28/01/2010

---

- Core: EveMails? now checked for MailingListIDs

Location:

trunk

Files:

• EveHQ.Core/EveMail.vb (modified) (2 diffs)
• EveHQ/Forms/frmMail.Designer.vb (modified) (6 diffs)
• EveHQ/Forms/frmMail.vb (modified) (2 diffs)

trunk/EveHQ.Core/EveMail.vb

@@ -24 +24 @@
                 If EveHQ.Core.HQ.EveHQSettings.Accounts.Contains(accountName) = True Then
                     Dim mAccount As EveHQ.Core.EveAccount = CType(EveHQ.Core.HQ.EveHQSettings.Accounts.Item(accountName), Core.EveAccount)
+                    ' Add in the data for mailing lists
+                    Call EveHQ.Core.DataFunctions.WriteMailingListIDsToDatabase(mPilot)
                     ' Make a call to the EveHQ.Core.API to fetch the EveMail
                     Dim mailXML As New XmlDocument
@@ -133 +135 @@
         Next
         Call EveHQ.Core.DataFunctions.WriteEveIDsToDatabase(IDs)
+
+        ' Add in the Mailing List IDs
+        For Each cMail As EveHQ.Core.EveMailMessage In Mails.Values
+            EveHQ.Core.DataFunctions.ParseIDs(IDs, cMail.ToCorpAllianceIDs)
+        Next
 
         ' Send E-mail notification of new mails if required

trunk/EveHQ/Forms/frmMail.Designer.vb

@@ -28 +28 @@
         Me.clvMail = New DotNetLib.Windows.Forms.ContainerListView
         Me.colFrom = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
+        Me.colTo = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
         Me.colSubject = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
         Me.colDateTime = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
@@ -33 +34 @@
         Me.clvNotifications = New DotNetLib.Windows.Forms.ContainerListView
         Me.ContainerListViewColumnHeader1 = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
+        Me.ContainerListViewColumnHeader4 = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
         Me.ContainerListViewColumnHeader2 = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
         Me.ContainerListViewColumnHeader3 = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
@@ -40 +42 @@
         Me.CollapsibleSplitter1 = New NJFLib.Controls.CollapsibleSplitter
         Me.panelMails = New System.Windows.Forms.Panel
-        Me.colTo = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
-        Me.ContainerListViewColumnHeader4 = New DotNetLib.Windows.Forms.ContainerListViewColumnHeader
         Me.panelNotifications.SuspendLayout()
         Me.panelMails.SuspendLayout()
@@ -96 +96 @@
         Me.colFrom.Width = 160
         '
+        'colTo
+        '
+        Me.colTo.CustomSortTag = Nothing
+        Me.colTo.DisplayIndex = 1
+        Me.colTo.SortDataType = DotNetLib.Windows.Forms.SortDataType.[String]
+        Me.colTo.Tag = Nothing
+        Me.colTo.Text = "To"
+        Me.colTo.Width = 160
+        '
         'colSubject
         '
@@ -143 +152 @@
         Me.ContainerListViewColumnHeader1.Text = "From"
         Me.ContainerListViewColumnHeader1.Width = 160
+        '
+        'ContainerListViewColumnHeader4
+        '
+        Me.ContainerListViewColumnHeader4.CustomSortTag = Nothing
+        Me.ContainerListViewColumnHeader4.DisplayIndex = 1
+        Me.ContainerListViewColumnHeader4.SortDataType = DotNetLib.Windows.Forms.SortDataType.[String]
+        Me.ContainerListViewColumnHeader4.Tag = Nothing
+        Me.ContainerListViewColumnHeader4.Text = "To"
+        Me.ContainerListViewColumnHeader4.Width = 160
         '
         'ContainerListViewColumnHeader2
@@ -219 +237 @@
         Me.panelMails.Size = New System.Drawing.Size(884, 325)
         Me.panelMails.TabIndex = 52
-        '
-        'colTo
-        '
-        Me.colTo.CustomSortTag = Nothing
-        Me.colTo.DisplayIndex = 1
-        Me.colTo.SortDataType = DotNetLib.Windows.Forms.SortDataType.[String]
-        Me.colTo.Tag = Nothing
-        Me.colTo.Text = "To"
-        Me.colTo.Width = 160
-        '
-        'ContainerListViewColumnHeader4
-        '
-        Me.ContainerListViewColumnHeader4.CustomSortTag = Nothing
-        Me.ContainerListViewColumnHeader4.DisplayIndex = 1
-        Me.ContainerListViewColumnHeader4.SortDataType = DotNetLib.Windows.Forms.SortDataType.[String]
-        Me.ContainerListViewColumnHeader4.Tag = Nothing
-        Me.ContainerListViewColumnHeader4.Text = "To"
-        Me.ContainerListViewColumnHeader4.Width = 160
         '
         'frmMail

trunk/EveHQ/Forms/frmMail.vb

@@ -151 +151 @@
                     ' Get Corp/Alliance IDs
                     EveHQ.Core.DataFunctions.ParseIDs(IDs, CStr(mailRow.Item("toCorpOrAllianceID")))
+                    ' Get Mailing List IDs
+                    EveHQ.Core.DataFunctions.ParseIDs(IDs, CStr(mailRow.Item("toListIDs")))
                 Next
                 Dim strID As New StringBuilder
@@ -176 +178 @@
         For Each newMail As EveHQ.Core.EveMailMessage In allMails.Values
             Dim mailItem As New ContainerListViewItem
-            If newMail.ToListIDs = "" Then
-                If FinalIDs.ContainsKey(newMail.SenderID) = True Then
-                    mailItem.Text = FinalIDs(newMail.SenderID)
-                Else
-                    'TODO: Replace this with a routine to get the name from the API
-                    mailItem.Text = "Unknown"
-                End If
-            Else
-                mailItem.Text = "<Mailing List>"
+            If FinalIDs.ContainsKey(newMail.SenderID) = True Then
+                mailItem.Text = FinalIDs(newMail.SenderID)
+            Else
+                'TODO: Replace this with a routine to get the name from the API??
+                mailItem.Text = "Unknown"
             End If
             clvMail.Items.Add(mailItem)
+            Dim strTo As String = newMail.ToCharacterIDs & ", " & newMail.ToCorpAllianceIDs & ", " & newMail.ToListIDs
             If newMail.ToCorpAllianceIDs <> "" Then
                 mailItem.SubItems(1).Text = displayPilot.Corp