feat: add configurable 12-hour and 24-hour time formats

ajax/editActivity.php

@@ -80,7 +80,6 @@
 $activityDate = trim(urldecode($_POST['date']));
 $activityHour = trim(urldecode($_POST['hour']));
 $activityMinute = trim(urldecode($_POST['minute']));
-$activityAMPM = trim(urldecode($_POST['ampm']));
 
 $dateFormatFlag = $_SESSION['CATS']->isDateDMY()
     ? DATE_FORMAT_DDMMYY
@@ -99,19 +98,17 @@
     $jobOrderID = -1;
 }
 
-/* Convert formatted time to UNIX timestamp. */
-$time = strtotime(
-    sprintf('%02d:%02d %s', $activityHour, $activityMinute, $activityAMPM)
-);
+/* Convert time fields to a 'HH:MM:SS' string. */
+$is24 = $_SESSION['CATS']->isTimeFormat24();
+$activityAMPM = $is24 ? '' : trim(urldecode($_POST['ampm']));
+$timeStr = DateUtility::normalizeActivityTime($activityHour, $activityMinute, $activityAMPM, $is24);
+if ($timeStr === false)
+{
+    die('Invalid time.');
+}
 
 /* Create MySQL date string w/ 24hr time (YYYY-MM-DD HH:MM:SS). */
-$date = sprintf(
-    '%s %s',
-    DateUtility::convert(
-        '-', $activityDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD
-    ),
-    date('H:i:00', $time)
-);
+$date = DateUtility::convert('-', $activityDate, $dateFormatFlag, DATE_FORMAT_YYYYMMDD) . ' ' . $timeStr;
 
 /* Save the new activity entry. */
 $activityEntries = new ActivityEntries();

installwizard.php

@@ -480,6 +480,17 @@
                                                         </select>
                                                     </td>
                                                 </tr>
+                                                <tr>
+                                                    <td>Please choose your preferred time format.</td>
+                                                </tr>
+                                                <tr>
+                                                    <td>
+                                                        <select id="timeFormat" name="timeFormat" style="width: 150px;" class="selectBox">
+                                                            <option value="12" selected="selected">12-hour (1:30 PM)</option>
+                                                            <option value="24">24-hour (13:30)</option>
+                                                        </select>
+                                                    </td>
+                                                </tr>
                                                 <tr>
                                                     <td>Please enter your default phone country calling code.</td>
                                                 </tr>

js/activity.js

@@ -296,31 +296,46 @@
         var userDateFormat = (typeof window.CATSUserDateFormat !== "undefined" ? window.CATSUserDateFormat : "MM-DD-YY");
         dateSpan.innerHTML = DateInputForDOM("dateEditActivity" + activityID, true, userDateFormat, dateAndTime.substr(0,dateAndTime.indexOf(" ")), -1);
 
-        var timeString = dateAndTime.substr(dateAndTime.indexOf(" ")+2);
-        var hourString = timeString.substr(0,timeString.indexOf(":"));
-        var timeString = timeString.substr(timeString.indexOf(":")+1);
-        var minuteString = timeString.substr(0,timeString.indexOf(" "));
-        var timeString = timeString.substr(timeString.indexOf(" ")+1);
-        var amPmString = timeString.substr(0,timeString.indexOf(")"));
-
-        /* Time editor. */
+        /* Parse time from display string: strip date prefix and the opening "(". */
+        var timeSection = dateAndTime.substr(dateAndTime.indexOf("(") + 1);
+        var hourString, minuteString, amPmString;
+        if (window.CATSTimeFormat24)
+        {
+            /* 24-hour display: "(HH:MM)" */
+            hourString   = timeSection.substr(0, timeSection.indexOf(":"));
+            minuteString = timeSection.substr(timeSection.indexOf(":") + 1, 2);
+            amPmString   = "";
+        }
+        else
+        {
+            /* 12-hour display: "(H:MM AM)" or "(H:MM PM)" */
+            hourString   = timeSection.substr(0, timeSection.indexOf(":"));
+            var rest     = timeSection.substr(timeSection.indexOf(":") + 1);
+            minuteString = rest.substr(0, rest.indexOf(" "));
+            amPmString   = rest.substr(rest.indexOf(" ") + 1, 2);
+        }
+
+        /* Time editor — hour select. */
         var hourSelect = document.createElement("select");
         hourSelect.setAttribute("id", "hourEditActivity" + activityID);
-        for (var i = 1; i<= 12; ++i)
+        var hourMin = window.CATSTimeFormat24 ? 0 : 1;
+        var hourMax = window.CATSTimeFormat24 ? 23 : 12;
+        for (var i = hourMin; i <= hourMax; ++i)
         {
             var hourSelectOption = document.createElement("option");
             hourSelectOption.value = i;
-            hourSelectOption.innerHTML = i;
+            hourSelectOption.innerHTML = window.CATSTimeFormat24 ? (i < 10 ? '0' + i : '' + i) : i;
             if (hourString * 1 == i)
             {
                 hourSelectOption.selected = true;
             }
             hourSelect.appendChild(hourSelectOption);
         }
-
+
+        /* Time editor — minute select. */
         var minuteSelect = document.createElement("select");
         minuteSelect.setAttribute("id", "minuteEditActivity" + activityID);
-        for (var i = 0; i<= 59; ++i)
+        for (var i = 0; i <= 59; ++i)
         {
             var minuteSelectOption = document.createElement("option");
             minuteSelectOption.value = i;
@@ -331,37 +346,45 @@
             }
             minuteSelect.appendChild(minuteSelectOption);
         }
-
-        var AMPMSelect = document.createElement("select");
-        AMPMSelect.setAttribute("id", "ampmEditActivity" + activityID);
-
-        var AMPMSelectOptionAM = document.createElement("option");
-        AMPMSelectOptionAM.value = "AM";
-        AMPMSelectOptionAM.innerHTML = "AM";
-        if (amPmString == "AM")
-        {
-            AMPMSelectOptionAM.selected = true;
-        }
-        AMPMSelect.appendChild(AMPMSelectOptionAM);
-
-        var AMPMSelectOptionPM = document.createElement("option");
-        AMPMSelectOptionPM.value = "PM";
-        AMPMSelectOptionPM.innerHTML = "PM";
-        if (amPmString == "PM")
+
+        /* Time editor — AM/PM select (12-hour mode only). */
+        var AMPMSelect = null;
+        if (!window.CATSTimeFormat24)
         {
-            AMPMSelectOptionPM.selected = true;
+            AMPMSelect = document.createElement("select");
+            AMPMSelect.setAttribute("id", "ampmEditActivity" + activityID);
+
+            var AMPMSelectOptionAM = document.createElement("option");
+            AMPMSelectOptionAM.value = "AM";
+            AMPMSelectOptionAM.innerHTML = "AM";
+            if (amPmString == "AM")
+            {
+                AMPMSelectOptionAM.selected = true;
+            }
+            AMPMSelect.appendChild(AMPMSelectOptionAM);
+
+            var AMPMSelectOptionPM = document.createElement("option");
+            AMPMSelectOptionPM.value = "PM";
+            AMPMSelectOptionPM.innerHTML = "PM";
+            if (amPmString == "PM")
+            {
+                AMPMSelectOptionPM.selected = true;
+            }
+            AMPMSelect.appendChild(AMPMSelectOptionPM);
         }
-        AMPMSelect.appendChild(AMPMSelectOptionPM);
-
+
         var dateTimeTable = document.createElement("table");
         var dateTimeTableTr = document.createElement("tr");
         var dateTimeTableTdLeft = document.createElement("td");
         var dateTimeTableTdRight = document.createElement("td");
-
-        dateTimeTableTdLeft.appendChild(dateSpan);    
-        dateTimeTableTdRight.appendChild(hourSelect);    
-        dateTimeTableTdRight.appendChild(minuteSelect); 
-        dateTimeTableTdRight.appendChild(AMPMSelect);    
+
+        dateTimeTableTdLeft.appendChild(dateSpan);
+        dateTimeTableTdRight.appendChild(hourSelect);
+        dateTimeTableTdRight.appendChild(minuteSelect);
+        if (AMPMSelect)
+        {
+            dateTimeTableTdRight.appendChild(AMPMSelect);
+        }
         dateTimeTableTr.appendChild(dateTimeTableTdLeft);
         dateTimeTableTr.appendChild(dateTimeTableTdRight);
         dateTimeTable.appendChild(dateTimeTableTr);
@@ -390,7 +413,7 @@
                 document.getElementById("dateEditActivity" + activityID).value,
                 document.getElementById("hourEditActivity" + activityID).value,
                 document.getElementById("minuteEditActivity" + activityID).value,
-                document.getElementById("ampmEditActivity" + activityID).value,
+                AMPMSelect ? AMPMSelect.value : "",
                 oldEditRow,
                 newEditRow,
                 activityID,
@@ -861,6 +884,10 @@
 
     document.getElementById("hour").disabled = disableTime;
     document.getElementById("minute").disabled = disableTime;
-    document.getElementById("meridiem").disabled = disableTime;
+    var meridiem = document.getElementById("meridiem");
+    if (meridiem)
+    {
+        meridiem.disabled = disableTime;
+    }
     document.getElementById("duration").disabled = disableTime;
 }

js/wizardIntro.js

@@ -91,10 +91,12 @@
         // This is the localization page
         var timeZone = document.getElementById("timeZone");
         var dateFormat = document.getElementById("dateFormat");
+        var timeFormatEl = document.getElementById("timeFormat");
+        var timeFormat = timeFormatEl ? timeFormatEl.value : "12";
         failAction = "alert(\"Unable to set your localization settings! Please try again.\");";
         userActionSuccess = "funcNext();";
         failAction = "";
-        userAction("Localization&timeZone=" + escape(timeZone.value) + "&dateFormat=" + escape(dateFormat.value));
+        userAction("Localization&timeZone=" + escape(timeZone.value) + "&dateFormat=" + escape(dateFormat.value) + "&timeFormat=" + escape(timeFormat));
         return false;
     }
 

lib/ActivityEntries.php

@@ -63,11 +63,15 @@
 class ActivityEntries
 {
     private $_db;
+    private $_mysqlDateTimeFormat;
 
 
     public function __construct()
     {
         $this->_db = DatabaseConnection::getInstance();
+
+        $is24 = (isset($_SESSION['CATS']) && $_SESSION['CATS']->isTimeFormat24());
+        $this->_mysqlDateTimeFormat = DateUtility::getMysqlDateTimeFormat($is24);
     }
 
 
@@ -405,7 +409,7 @@
                 activity_type.short_description AS typeDescription,
                 activity.notes AS notes,
                 DATE_FORMAT(
-                    activity.date_occurred, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    activity.date_occurred, '" . $this->_mysqlDateTimeFormat . "'
                 ) AS dateCreated,
                 entered_by_user.first_name AS enteredByFirstName,
                 entered_by_user.last_name AS enteredByLastName,
@@ -450,7 +454,7 @@
                 activity.joborder_id AS jobOrderID,
                 activity.notes AS notes,
                 DATE_FORMAT(
-                    activity.date_occurred, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    activity.date_occurred, '" . $this->_mysqlDateTimeFormat . "'
                 ) AS dateCreated,
                 activity.date_occurred AS dateCreatedSort,
                 activity.type AS type,
@@ -503,7 +507,7 @@
                 activity.joborder_id AS jobOrderID,
                 activity.notes AS notes,
                 DATE_FORMAT(
-                    activity.date_occurred, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    activity.date_occurred, '" . $this->_mysqlDateTimeFormat . "'
                 ) AS dateCreated,
                 activity.date_occurred AS dateCreatedSort,
                 activity.type AS type,

lib/Attachments.php

@@ -487,7 +487,7 @@
                 directory_name AS directoryName,
                 md5_sum AS md5sum,
                 file_size_kb AS fileSizeKB,
-                DATE_FORMAT(date_created, '%%m-%%d-%%y (%%h:%%i:%%s %%p)') AS dateCreated
+                DATE_FORMAT(date_created, '" . DateUtility::getMysqlDateTimeSecondsFormat() . "') AS dateCreated
             FROM
                 attachment
             WHERE
@@ -550,7 +550,7 @@
                 directory_name AS directoryName,
                 md5_sum AS md5sum,
                 file_size_kb AS fileSizeKB,
-                DATE_FORMAT(date_created, '%%m-%%d-%%y (%%h:%%i:%%s %%p)') AS dateCreated
+                DATE_FORMAT(date_created, '" . DateUtility::getMysqlDateTimeSecondsFormat() . "') AS dateCreated
             FROM
                 attachment
             WHERE

lib/Calendar.php

@@ -109,7 +109,7 @@
                     calendar_event.date, '%%m-%%d-%%y'
                 ) AS date,
                 DATE_FORMAT(
-                    calendar_event.date, '%%h:%%i %%p'
+                    calendar_event.date, '" . DateUtility::getMysqlTimeFormat() . "'
                 ) AS time,
                 DATE_FORMAT(
                     calendar_event.date, '%%H'
@@ -119,7 +119,7 @@
                 ) AS minute,
                 calendar_event.date AS dateSort,
                 DATE_FORMAT(
-                    calendar_event.date_created, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    calendar_event.date_created, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateCreated,
                 calendar_event_type.calendar_event_type_id AS eventType,
                 calendar_event_type.short_description AS eventTypeDescription,
@@ -608,7 +608,7 @@
                 calendar_event.description AS description,
                 calendar_event.public AS public,
                 DATE_FORMAT(
-                    calendar_event.date, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    calendar_event.date, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateShow,
                 DATE_FORMAT(
                     calendar_event.date, '%%d'
@@ -705,7 +705,7 @@
                     calendar_event.date, '%%m-%%d-%%y'
                 ) AS date,
                 DATE_FORMAT(
-                    calendar_event.date, '%%h:%%i %%p'
+                    calendar_event.date, '" . DateUtility::getMysqlTimeFormat() . "'
                 ) AS time,
                 calendar_event.date AS dateSort,
                 entered_by_user.user_id AS userID,
@@ -752,7 +752,7 @@
                     calendar_event.date, '%%m-%%d-%%y'
                 ) AS date,
                 DATE_FORMAT(
-                    calendar_event.date, '%%h:%%i %%p'
+                    calendar_event.date, '" . DateUtility::getMysqlTimeFormat() . "'
                 ) AS time,
                 calendar_event.date AS dateSort,
                 entered_by_user.user_id AS userID,

lib/Candidates.php

@@ -537,10 +537,10 @@
                 candidate.is_hot AS isHot,
                 candidate.is_admin_hidden AS isAdminHidden,
                 DATE_FORMAT(
-                    candidate.date_created, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    candidate.date_created, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateCreated,
                 DATE_FORMAT(
-                    candidate.date_modified, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    candidate.date_modified, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateModified,
                 COUNT(
                     candidate_joborder.joborder_id

lib/Companies.php

@@ -374,7 +374,7 @@
                     billing_contact.first_name, ' ', billing_contact.last_name
                 ) AS billingContactFullName,
                 DATE_FORMAT(
-                    company.date_created, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    company.date_created, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateCreated,
                 CONCAT(
                     entered_by_user.first_name, ' ', entered_by_user.last_name

lib/Contacts.php

@@ -528,10 +528,10 @@
                 reportsToContact.title as reportsToTitle,
                 company_department.name AS department,
                 DATE_FORMAT(
-                    contact.date_created, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    contact.date_created, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateCreated,
                 DATE_FORMAT(
-                    contact.date_modified, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    contact.date_modified, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateModified,
                 company.name AS companyName,
                 company.is_hot AS isHotCompany,
@@ -659,7 +659,7 @@
                     contact.date_created, '%%m-%%d-%%y'
                 ) AS dateCreated,
                 DATE_FORMAT(
-                    contact.date_modified, '%%m-%%d-%%y (%%h:%%i %%p)'
+                    contact.date_modified, '" . DateUtility::getMysqlDateTimeFormat() . "'
                 ) AS dateModified,
                 owner_user.first_name AS ownerFirstName,
                 owner_user.last_name AS ownerLastName,