From f8216fb0332e5e276f5f3816e1fe4776737ca476 Mon Sep 17 00:00:00 2001
From: anonymoususer72041
 <247563575+anonymoususer72041@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:00:00 +0100
Subject: [PATCH 1/5] Require activity type selection in activity modals
 (client-side)

---
 .../AddActivityChangeStatusModal.tpl          |  3 +-
 modules/candidates/activityvalidator.js       | 27 +++++++
 .../AddActivityScheduleEventModal.tpl         |  5 +-
 modules/contacts/activityvalidator.js         | 77 +++++++++++++++++++
 4 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 modules/contacts/activityvalidator.js

diff --git a/modules/candidates/AddActivityChangeStatusModal.tpl b/modules/candidates/AddActivityChangeStatusModal.tpl
index ad04c0c14..595f2c7d4 100755
--- a/modules/candidates/AddActivityChangeStatusModal.tpl
+++ b/modules/candidates/AddActivityChangeStatusModal.tpl
@@ -122,7 +122,8 @@
                     <div id="activityNoteDiv" style="margin-top: 4px;">
                         <span id="addActivitySpanA">Activity Type</span><br />
                         <select id="activityTypeID" name="activityTypeID" class="inputbox" style="width: 150px; margin-bottom: 4px;">
-                            <option selected="selected" value="<?php echo(ACTIVITY_CALL); ?>">Call</option>
+                            <option selected="selected" value="">-- Select --</option>
+                            <option value="<?php echo(ACTIVITY_CALL); ?>">Call</option>
                             <option value="<?php echo(ACTIVITY_CALL_TALKED); ?>">Call (Talked)</option>
                             <option value="<?php echo(ACTIVITY_CALL_LVM); ?>">Call (LVM)</option>
                             <option value="<?php echo(ACTIVITY_CALL_MISSED); ?>">Call (Missed)</option>
diff --git a/modules/candidates/activityvalidator.js b/modules/candidates/activityvalidator.js
index 1ca550928..90d1e23fa 100755
--- a/modules/candidates/activityvalidator.js
+++ b/modules/candidates/activityvalidator.js
@@ -12,6 +12,7 @@ function checkActivityForm(form)
 {
     var errorMessage = '';
 
+    errorMessage += checkActivityType();
     errorMessage += checkEventTitle();
 
     if (errorMessage != '')
@@ -23,6 +24,32 @@ function checkActivityForm(form)
     return true;
 }
 
+function checkActivityType()
+{
+    var errorMessage = '';
+
+    addActivity = document.getElementById('addActivity').checked;
+    if (!addActivity)
+    {
+        return '';
+    }
+
+    fieldValue = document.getElementById('activityTypeID').value;
+    fieldLabel = document.getElementById('addActivitySpanA');
+    if (fieldValue == '')
+    {
+        errorMessage = "    - You must select an activity type.\n";
+
+        fieldLabel.style.color = '#ff0000';
+    }
+    else
+    {
+        fieldLabel.style.color = '#000';
+    }
+
+    return errorMessage;
+}
+
 function checkEventTitle()
 {
     var errorMessage = '';
diff --git a/modules/contacts/AddActivityScheduleEventModal.tpl b/modules/contacts/AddActivityScheduleEventModal.tpl
index a9e309adf..b0b2150d1 100755
--- a/modules/contacts/AddActivityScheduleEventModal.tpl
+++ b/modules/contacts/AddActivityScheduleEventModal.tpl
@@ -12,7 +12,7 @@
     window.CATSUserDateFormat = '<?php echo($_SESSION['CATS']->isDateDMY() ? 'DD-MM-YY' : 'MM-DD-YY'); ?>';
 </script>
 
-    <form name="logActivityForm" id="logActivityForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=contacts&amp;a=addActivityScheduleEvent<?php if($this->onlyScheduleEvent): ?>&amp;onlyScheduleEvent=true<?php endif; ?>" method="post" autocomplete="off">
+    <form name="logActivityForm" id="logActivityForm" action="<?php echo(CATSUtility::getIndexName()); ?>?m=contacts&amp;a=addActivityScheduleEvent<?php if($this->onlyScheduleEvent): ?>&amp;onlyScheduleEvent=true<?php endif; ?>" method="post" onsubmit="return checkActivityForm(document.logActivityForm);" autocomplete="off">
         <input type="hidden" name="postback" id="postback" value="postback" />
         <input type="hidden" id="contactID" name="contactID" value="<?php echo($this->contactID); ?>" />
 
@@ -41,7 +41,8 @@
                     <div id="activityNoteDiv" style="margin-top: 4px;">
                         <span id="addActivitySpanA">Activity Type</span><br />
                         <select id="activityTypeID" name="activityTypeID" class="inputbox" style="width: 150px; margin-bottom: 4px;">
-                            <option selected="selected" value="<?php echo(ACTIVITY_CALL); ?>">Call</option>
+                            <option selected="selected" value="">-- Select --</option>
+                            <option value="<?php echo(ACTIVITY_CALL); ?>">Call</option>
                             <option value="<?php echo(ACTIVITY_CALL_TALKED); ?>">Call (Talked)</option>
                             <option value="<?php echo(ACTIVITY_CALL_LVM); ?>">Call (LVM)</option>
                             <option value="<?php echo(ACTIVITY_CALL_MISSED); ?>">Call (Missed)</option>
diff --git a/modules/contacts/activityvalidator.js b/modules/contacts/activityvalidator.js
new file mode 100644
index 000000000..373072d3c
--- /dev/null
+++ b/modules/contacts/activityvalidator.js
@@ -0,0 +1,77 @@
+/*
+ * CATS
+ * Contacts Form Validation
+ *
+ * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
+ * All rights reserved.
+ *
+ * $Id$
+ */
+
+function checkActivityForm(form)
+{
+    var errorMessage = '';
+
+    errorMessage += checkActivityType();
+    errorMessage += checkEventTitle();
+
+    if (errorMessage != '')
+    {
+        alert("Form Error:\n" + errorMessage);
+        return false;
+    }
+
+    return true;
+}
+
+function checkActivityType()
+{
+    var errorMessage = '';
+
+    addActivity = document.getElementById('addActivity').checked;
+    if (!addActivity)
+    {
+        return '';
+    }
+
+    fieldValue = document.getElementById('activityTypeID').value;
+    fieldLabel = document.getElementById('addActivitySpanA');
+    if (fieldValue == '')
+    {
+        errorMessage = "    - You must select an activity type.\n";
+
+        fieldLabel.style.color = '#ff0000';
+    }
+    else
+    {
+        fieldLabel.style.color = '#000';
+    }
+
+    return errorMessage;
+}
+
+function checkEventTitle()
+{
+    var errorMessage = '';
+
+    scheduleEvent = document.getElementById('scheduleEvent').checked;
+    if (!scheduleEvent)
+    {
+        return '';
+    }
+
+    fieldValue = document.getElementById('title').value;
+    fieldLabel = document.getElementById('titleLabel');
+    if (fieldValue == '')
+    {
+        errorMessage = "    - You must enter an event title.\n";
+
+        fieldLabel.style.color = '#ff0000';
+    }
+    else
+    {
+        fieldLabel.style.color = '#000';
+    }
+
+    return errorMessage;
+}

From b181ed024043a3a367ec7050f91e1c831037cedc Mon Sep 17 00:00:00 2001
From: anonymoususer72041
 <247563575+anonymoususer72041@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:00:00 +0100
Subject: [PATCH 2/5] Require activity type selection when logging activities
 (server-side)

---
 modules/candidates/CandidatesUI.php | 17 +++++++++++------
 modules/contacts/ContactsUI.php     | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/modules/candidates/CandidatesUI.php b/modules/candidates/CandidatesUI.php
index b341eabf9..8aaa11582 100755
--- a/modules/candidates/CandidatesUI.php
+++ b/modules/candidates/CandidatesUI.php
@@ -3037,13 +3037,20 @@ private function _addActivityChangeStatus($isJobOrdersMode, $regardingID,
 
         if ($this->isChecked('addActivity', $_POST))
         {
-            /* Bail out if we don't have a valid job order ID. */
-            if (!$this->isOptionalIDValid('activityTypeID', $_POST))
+            if (!$this->isRequiredIDValid('activityTypeID', $_POST))
             {
-                CommonErrors::fatalModal(COMMONERROR_BADINDEX, $this, 'Invalid activity type ID.');
+                $this->fatalModal('You must select an activity type.');
             }
 
-            $activityTypeID = $_POST['activityTypeID'];
+            $activityTypeID = (int) $_POST['activityTypeID'];
+            $activityEntries = new ActivityEntries($this->_siteID);
+            $activityTypes = $activityEntries->getTypes();
+            if (ResultSetUtility::findRowByColumnValue(
+                $activityTypes, 'typeID', $activityTypeID
+            ) === false)
+            {
+                CommonErrors::fatalModal(COMMONERROR_BADINDEX, $this, 'Invalid activity type ID.');
+            }
 
             $activityNote = $this->getTrimmedInput('activityNote', $_POST);
 
@@ -3063,7 +3070,6 @@ private function _addActivityChangeStatus($isJobOrdersMode, $regardingID,
             }
 
             /* Add the activity entry. */
-            $activityEntries = new ActivityEntries($this->_siteID);
             $activityID = $activityEntries->add(
                 $candidateID,
                 DATA_ITEM_CANDIDATE,
@@ -3072,7 +3078,6 @@ private function _addActivityChangeStatus($isJobOrdersMode, $regardingID,
                 $this->_userID,
                 $regardingID
             );
-            $activityTypes = $activityEntries->getTypes();
             $activityTypeDescription = ResultSetUtility::getColumnValueByIDValue(
                 $activityTypes, 'typeID', $activityTypeID, 'type'
             );
diff --git a/modules/contacts/ContactsUI.php b/modules/contacts/ContactsUI.php
index 4c286eb0d..76f739e2a 100755
--- a/modules/contacts/ContactsUI.php
+++ b/modules/contacts/ContactsUI.php
@@ -1346,20 +1346,26 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = ''
 
         if ($this->isChecked('addActivity', $_POST))
         {
-            /* Bail out if we don't have a valid job order ID. */
-            if (!$this->isOptionalIDValid('activityTypeID', $_POST))
+            if (!$this->isRequiredIDValid('activityTypeID', $_POST))
             {
-                CommonErrors::fatalModal(COMMONERROR_BADINDEX, $this, 'Invalid activity type ID.');
+                $this->fatalModal('You must select an activity type.');
             }
 
-            $activityTypeID = $_POST['activityTypeID'];
+            $activityTypeID = (int) $_POST['activityTypeID'];
+            $activityEntries = new ActivityEntries($this->_siteID);
+            $activityTypes = $activityEntries->getTypes();
+            if (ResultSetUtility::findRowByColumnValue(
+                $activityTypes, 'typeID', $activityTypeID
+            ) === false)
+            {
+                CommonErrors::fatalModal(COMMONERROR_BADINDEX, $this, 'Invalid activity type ID.');
+            }
 
             $activityNote = $this->getSanitisedInput('activityNote', $_POST);
 
             $activityNote = htmlspecialchars($activityNote);
 
             /* Add the activity entry. */
-            $activityEntries = new ActivityEntries($this->_siteID);
             $activityID = $activityEntries->add(
                 $contactID,
                 DATA_ITEM_CONTACT,
@@ -1368,7 +1374,6 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = ''
                 $this->_userID,
                 $regardingID
             );
-            $activityTypes = $activityEntries->getTypes();
             $activityTypeDescription = ResultSetUtility::getColumnValueByIDValue(
                 $activityTypes, 'typeID', $activityTypeID, 'type'
             );

From 4c93eeece50ace5d8013c635db5b6bfc9e01cf80 Mon Sep 17 00:00:00 2001
From: anonymoususer72041
 <247563575+anonymoususer72041@users.noreply.github.com>
Date: Fri, 23 Jan 2026 15:50:11 +0100
Subject: [PATCH 3/5] Update activities Behat test for required activity type

---
 test/features/activities.feature | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/features/activities.feature b/test/features/activities.feature
index a403d534b..e304fe9a0 100644
--- a/test/features/activities.feature
+++ b/test/features/activities.feature
@@ -13,6 +13,7 @@ Feature: Activities
     And I follow "Log an Activity"
     And I wait for the activity note box to appear
     And I switch to the iframe "popupInner"
+    And I select "Call" from "activityTypeID"
     And fill in "activityNote" with "Call Gandalf"
     And press "Save"
     And press "Close"
@@ -22,4 +23,4 @@ Feature: Activities
     And I should see "Call Gandalf"
     And I should see "Yesterday"
     And I should see "Today"
-    And I should see "Last week"
\ No newline at end of file
+    And I should see "Last week"

From 369a7f1383b8c6947fe881ec66639d32957af0a0 Mon Sep 17 00:00:00 2001
From: RussH <russh@opencats.org>
Date: Tue, 17 Mar 2026 11:28:54 +0000
Subject: [PATCH 4/5] Fix JS style issues in activity validators

---
 modules/candidates/activityvalidator.js | 19 +++++++------------
 modules/contacts/activityvalidator.js   | 19 +++++++------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/modules/candidates/activityvalidator.js b/modules/candidates/activityvalidator.js
index 90d1e23fa..27c8a6527 100755
--- a/modules/candidates/activityvalidator.js
+++ b/modules/candidates/activityvalidator.js
@@ -1,11 +1,6 @@
 /*
- * CATS
+ * OpenCATS
  * Candidates Form Validation
- *
- * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
- * All rights reserved.
- *
- * $Id: activityvalidator.js 2336 2007-04-14 22:01:51Z will $
  */
 
 function checkActivityForm(form)
@@ -28,14 +23,14 @@ function checkActivityType()
 {
     var errorMessage = '';
 
-    addActivity = document.getElementById('addActivity').checked;
+    var addActivity = document.getElementById('addActivity').checked;
     if (!addActivity)
     {
         return '';
     }
 
-    fieldValue = document.getElementById('activityTypeID').value;
-    fieldLabel = document.getElementById('addActivitySpanA');
+    var fieldValue = document.getElementById('activityTypeID').value;
+    var fieldLabel = document.getElementById('addActivitySpanA');
     if (fieldValue == '')
     {
         errorMessage = "    - You must select an activity type.\n";
@@ -54,14 +49,14 @@ function checkEventTitle()
 {
     var errorMessage = '';
 
-    scheduleEvent = document.getElementById('scheduleEvent').checked;
+    var scheduleEvent = document.getElementById('scheduleEvent').checked;
     if (!scheduleEvent)
     {
         return '';
     }
 
-    fieldValue = document.getElementById('title').value;
-    fieldLabel = document.getElementById('titleLabel');
+    var fieldValue = document.getElementById('title').value;
+    var fieldLabel = document.getElementById('titleLabel');
     if (fieldValue == '')
     {
         errorMessage = "    - You must enter an event title.\n";
diff --git a/modules/contacts/activityvalidator.js b/modules/contacts/activityvalidator.js
index 373072d3c..4bc7c6ef3 100644
--- a/modules/contacts/activityvalidator.js
+++ b/modules/contacts/activityvalidator.js
@@ -1,11 +1,6 @@
 /*
- * CATS
+ * OpenCATS
  * Contacts Form Validation
- *
- * Copyright (C) 2005 - 2007 Cognizo Technologies, Inc.
- * All rights reserved.
- *
- * $Id$
  */
 
 function checkActivityForm(form)
@@ -28,14 +23,14 @@ function checkActivityType()
 {
     var errorMessage = '';
 
-    addActivity = document.getElementById('addActivity').checked;
+    var addActivity = document.getElementById("addActivity").checked;
     if (!addActivity)
     {
         return '';
     }
 
-    fieldValue = document.getElementById('activityTypeID').value;
-    fieldLabel = document.getElementById('addActivitySpanA');
+    var fieldValue = document.getElementById("activityTypeID").value;
+    var fieldLabel = document.getElementById("addActivitySpanA");
     if (fieldValue == '')
     {
         errorMessage = "    - You must select an activity type.\n";
@@ -54,14 +49,14 @@ function checkEventTitle()
 {
     var errorMessage = '';
 
-    scheduleEvent = document.getElementById('scheduleEvent').checked;
+    var scheduleEvent = document.getElementById('scheduleEvent').checked;
     if (!scheduleEvent)
     {
         return '';
     }
 
-    fieldValue = document.getElementById('title').value;
-    fieldLabel = document.getElementById('titleLabel');
+    var fieldValue = document.getElementById("title").value;
+    var fieldLabel = document.getElementById("titleLabe"');
     if (fieldValue == '')
     {
         errorMessage = "    - You must enter an event title.\n";

From 8688a004f2ef6f4bea5eae32ff4e473628bbb31d Mon Sep 17 00:00:00 2001
From: RussH <russh@opencats.org>
Date: Tue, 17 Mar 2026 13:44:08 +0000
Subject: [PATCH 5/5] Take 2: Fix JS style issues in activity validators

---
 modules/candidates/activityvalidator.js | 36 ++++++++++++-------------
 modules/contacts/activityvalidator.js   | 28 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/candidates/activityvalidator.js b/modules/candidates/activityvalidator.js
index 27c8a6527..7d3d528ed 100755
--- a/modules/candidates/activityvalidator.js
+++ b/modules/candidates/activityvalidator.js
@@ -5,12 +5,12 @@
 
 function checkActivityForm(form)
 {
-    var errorMessage = '';
+    var errorMessage = "";
 
     errorMessage += checkActivityType();
     errorMessage += checkEventTitle();
 
-    if (errorMessage != '')
+    if (errorMessage != "")
     {
         alert("Form Error:\n" + errorMessage);
         return false;
@@ -21,25 +21,25 @@ function checkActivityForm(form)
 
 function checkActivityType()
 {
-    var errorMessage = '';
+    var errorMessage = "";
 
-    var addActivity = document.getElementById('addActivity').checked;
+    var addActivity = document.getElementById("addActivity").checked;
     if (!addActivity)
     {
-        return '';
+        return "";
     }
 
-    var fieldValue = document.getElementById('activityTypeID').value;
-    var fieldLabel = document.getElementById('addActivitySpanA');
-    if (fieldValue == '')
+    var fieldValue = document.getElementById("activityTypeID").value;
+    var fieldLabel = document.getElementById("addActivitySpanA");
+    if (fieldValue == "")
     {
         errorMessage = "    - You must select an activity type.\n";
 
-        fieldLabel.style.color = '#ff0000';
+        fieldLabel.style.color = "#ff0000";
     }
     else
     {
-        fieldLabel.style.color = '#000';
+        fieldLabel.style.color = "#000";
     }
 
     return errorMessage;
@@ -47,25 +47,25 @@ function checkActivityType()
 
 function checkEventTitle()
 {
-    var errorMessage = '';
+    var errorMessage = "";
 
-    var scheduleEvent = document.getElementById('scheduleEvent').checked;
+    var scheduleEvent = document.getElementById("scheduleEvent").checked;
     if (!scheduleEvent)
     {
-        return '';
+        return "";
     }
 
-    var fieldValue = document.getElementById('title').value;
-    var fieldLabel = document.getElementById('titleLabel');
-    if (fieldValue == '')
+    var fieldValue = document.getElementById("title").value;
+    var fieldLabel = document.getElementById("titleLabel");
+    if (fieldValue == "")
     {
         errorMessage = "    - You must enter an event title.\n";
 
-        fieldLabel.style.color = '#ff0000';
+        fieldLabel.style.color = "#ff0000";
     }
     else
     {
-        fieldLabel.style.color = '#000';
+        fieldLabel.style.color = "#000";
     }
 
     return errorMessage;
diff --git a/modules/contacts/activityvalidator.js b/modules/contacts/activityvalidator.js
index 4bc7c6ef3..d2ccc37da 100644
--- a/modules/contacts/activityvalidator.js
+++ b/modules/contacts/activityvalidator.js
@@ -5,12 +5,12 @@
 
 function checkActivityForm(form)
 {
-    var errorMessage = '';
+    var errorMessage = "";
 
     errorMessage += checkActivityType();
     errorMessage += checkEventTitle();
 
-    if (errorMessage != '')
+    if (errorMessage != "")
     {
         alert("Form Error:\n" + errorMessage);
         return false;
@@ -21,25 +21,25 @@ function checkActivityForm(form)
 
 function checkActivityType()
 {
-    var errorMessage = '';
+    var errorMessage = "";
 
     var addActivity = document.getElementById("addActivity").checked;
     if (!addActivity)
     {
-        return '';
+        return "";
     }
 
     var fieldValue = document.getElementById("activityTypeID").value;
     var fieldLabel = document.getElementById("addActivitySpanA");
-    if (fieldValue == '')
+    if (fieldValue == "")
     {
         errorMessage = "    - You must select an activity type.\n";
 
-        fieldLabel.style.color = '#ff0000';
+        fieldLabel.style.color = "#ff0000";
     }
     else
     {
-        fieldLabel.style.color = '#000';
+        fieldLabel.style.color = "#000";
     }
 
     return errorMessage;
@@ -47,25 +47,25 @@ function checkActivityType()
 
 function checkEventTitle()
 {
-    var errorMessage = '';
+    var errorMessage = "";
 
-    var scheduleEvent = document.getElementById('scheduleEvent').checked;
+    var scheduleEvent = document.getElementById("scheduleEvent").checked;
     if (!scheduleEvent)
     {
-        return '';
+        return "";
     }
 
     var fieldValue = document.getElementById("title").value;
-    var fieldLabel = document.getElementById("titleLabe"');
-    if (fieldValue == '')
+    var fieldLabel = document.getElementById("titleLabel");
+    if (fieldValue == "")
     {
         errorMessage = "    - You must enter an event title.\n";
 
-        fieldLabel.style.color = '#ff0000';
+        fieldLabel.style.color = "#ff0000";
     }
     else
     {
-        fieldLabel.style.color = '#000';
+        fieldLabel.style.color = "#000";
     }
 
     return errorMessage;