Add more useful info to sync report

beabee-communityrm · Aug 1, 2024 · b890a3e · b890a3e
1 parent 69408d1
commit b890a3e
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/apps/backend/src/apps/settings/apps/newsletters/views/report.pug b/apps/backend/src/apps/settings/apps/newsletters/views/report.pug
@@ -1,6 +1,13 @@
 
 extends /views/base.pug
 
+mixin diff(a, b)
+	span
+		if a !== b
+			| #{a} ↔ #{b}
+		else
+			| -
+
 block contents
 	.row
 		.col-md-12
@@ -17,7 +24,12 @@ block contents
 				tbody
 					each contact in newContactsToUpload
 						tr
-							td: a(href='/members/' + contact.id)= contact.fullname
+							td
+								a(href='/members/' + contact.id)= contact.fullname || contact.email
+								if contact.membership.isActive
+									|
+									|
+									span.label.label-success Member
 							td= contact.email
 
 			h4 Contacts to import
@@ -44,15 +56,9 @@ block contents
 					each m in mismatchedContacts
 						tr
 							td: a(href='/members/' + m.contact.id)= m.contact.fullname
-							td
-								= m.contact.profile.newsletterStatus
-								| <>
-								= m.status
-							td
-								= m.contact.profile.newsletterGroups
-								| <>
-								= m.groups
-							td
-								= m.contact.membership && m.contact.membership.isActive ? 'Yes' : 'No'
-								| <>
-								= m.tags.includes(Options('newsletter-active-member-tag')) ? 'Yes' : 'No'
+							td: +diff(m.contact.profile.newsletterStatus, m.status)
+							td: +diff(m.contact.profile.newsletterGroups.toString(), m.groups.toString())
+							td: +diff(
+									m.contact.membership && m.contact.membership.isActive ? 'Yes' : 'No',
+									m.tags.includes(Options('newsletter-active-member-tag')) ? 'Yes' : 'No'
+								)