BUG 12562 "Date appears incorrect in the Generated Document..." SOLVED

- Date appears incorrect in the Generated Document List and Input Document List
- Bug has been reviewed and has not been able to replicate, it has been
  tested on a local installation version 2.0.43 where I verify that the dates are correct
- We found hardcoded code, the same has been corrected

* Available from version ProcessMaker-2.5.2-testing.1

workflow/engine/classes/class.case.php

@@ -4129,6 +4129,12 @@ class Cases
 
     public function getAllUploadedDocumentsCriteria($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID)
     {
+        G::LoadClass("configuration");
+
+        $conf = new Configurations();
+
+        $confEnvSetting = $conf->getFormats();
+
         //verifica si existe la tabla OBJECT_PERMISSION
         $this->verifyTable();
         $listing = false;
@@ -4218,13 +4224,16 @@ class Cases
             }
             $aAux = $oAppDocument->load($aRow['APP_DOC_UID'], $aRow['DOC_VERSION']);
             $lastVersion = $oAppDocument->getLastAppDocVersion($aRow['APP_DOC_UID'], $sApplicationUID);
+
             try {
                 $aAux1 = $oUser->load($aAux['USR_UID']);
-                $sUser = $aAux1['USR_FIRSTNAME'] . ' ' . $aAux1['USR_LASTNAME'];
+
+                $sUser = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $aAux1["USR_USERNAME"], $aAux1["USR_FIRSTNAME"], $aAux1["USR_LASTNAME"]);
             } catch (Exception $oException) {
                 //$sUser = '(USER DELETED)';
                 $sUser = '***';
             }
+
             $aFields = array(
                 'APP_DOC_UID' => $aAux['APP_DOC_UID'],
                 'DOC_UID' => $aAux['DOC_UID'],
@@ -4302,12 +4311,15 @@ class Cases
             }
             $aAux = $oAppDocument->load($aRow['APP_DOC_UID'], $aRow['DOC_VERSION']);
             $lastVersion = $oAppDocument->getLastAppDocVersion($aRow['APP_DOC_UID'], $sApplicationUID);
+
             try {
                 $aAux1 = $oUser->load($aAux['USR_UID']);
-                $sUser = $aAux1['USR_FIRSTNAME'] . ' ' . $aAux1['USR_LASTNAME'];
+
+                $sUser = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $aAux1["USR_USERNAME"], $aAux1["USR_FIRSTNAME"], $aAux1["USR_LASTNAME"]);
             } catch (Exception $oException) {
                 $sUser = '***';
             }
+
             $aFields = array(
                 'APP_DOC_UID' => $aAux['APP_DOC_UID'],
                 'DOC_UID' => $aAux['DOC_UID'],
@@ -4364,12 +4376,15 @@ class Cases
             $aTask = array('TAS_TITLE' => '[ ' . G::LoadTranslation('ID_SUPERVISOR') . ' ]');
             $aAux = $oAppDocument->load($aRow['APP_DOC_UID'], $aRow['DOC_VERSION']);
             $lastVersion = $oAppDocument->getLastAppDocVersion($aRow['APP_DOC_UID'], $sApplicationUID);
+
             try {
                 $aAux1 = $oUser->load($aAux['USR_UID']);
-                $sUser = $aAux1['USR_FIRSTNAME'] . ' ' . $aAux1['USR_LASTNAME'];
+
+                $sUser = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $aAux1["USR_USERNAME"], $aAux1["USR_FIRSTNAME"], $aAux1["USR_LASTNAME"]);
             } catch (Exception $oException) {
                 $sUser = '***';
             }
+
             $aFields = array(
                 'APP_DOC_UID' => $aAux['APP_DOC_UID'],
                 'DOC_UID' => $aAux['DOC_UID'],
@@ -4434,6 +4449,12 @@ class Cases
 
     public function getAllGeneratedDocumentsCriteria($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID)
     {
+        G::LoadClass("configuration");
+
+        $conf = new Configurations();
+
+        $confEnvSetting = $conf->getFormats();
+
         //verifica si la tabla OBJECT_PERMISSION
         $this->verifyTable();
         $listing = false;
@@ -4590,9 +4611,11 @@ class Cases
                         }
                         break;
                 }
+
                 try {
                     $aAux1 = $oUser->load($aAux['USR_UID']);
-                    $sUser = $aAux1['USR_FIRSTNAME'] . ' ' . $aAux1['USR_LASTNAME'];
+
+                    $sUser = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $aAux1["USR_USERNAME"], $aAux1["USR_FIRSTNAME"], $aAux1["USR_LASTNAME"]);
                 } catch (Exception $oException) {
                     $sUser = '(USER DELETED)';
                 }

workflow/engine/classes/class.configuration.php

@@ -339,7 +339,7 @@ class Configurations // extends Configuration
 
     public function usersNameFormatBySetParameters($formatUserName, $userName, $firstName, $lastName)
     {
-        $usersNameFormat = (!empty($formatUserName))? str_replace(array("@userName", "@firstName", "@lastName"), array($userName, $firstName, $lastName), $formatUserName) : null;
+        $usersNameFormat = str_replace(array("@userName", "@firstName", "@lastName"), array($userName, $firstName, $lastName), $formatUserName);
         $usersNameFormat = trim($usersNameFormat);
 
         return $usersNameFormat;
@@ -356,23 +356,21 @@ class Configurations // extends Configuration
     {
         $field = "USR_LASTNAME";
 
-        $confEnvSetting = $this->getConfiguration("ENVIRONMENT_SETTINGS", "");
+        $confEnvSetting = $this->getFormats();
 
-        if (is_array($confEnvSetting) && isset($confEnvSetting["format"])) {
-            $arrayAux = explode(" ", str_replace(array("(", ")", ","), array(null, null, null), $confEnvSetting["format"]));
+        $arrayAux = explode(" ", str_replace(array("(", ")", ","), array(null, null, null), $confEnvSetting["format"]));
 
-            if (isset($arrayAux[0])) {
-                switch (trim($arrayAux[0])) {
-                    case "@userName":
-                        $field = "USR_USERNAME";
-                        break;
-                    case "@firstName":
-                        $field = "USR_FIRSTNAME";
-                        break;
-                    case "@lastName":
-                        $field = "USR_LASTNAME";
-                        break;
-                }
+        if (isset($arrayAux[0])) {
+            switch (trim($arrayAux[0])) {
+                case "@userName":
+                    $field = "USR_USERNAME";
+                    break;
+                case "@firstName":
+                    $field = "USR_FIRSTNAME";
+                    break;
+                case "@lastName":
+                    $field = "USR_LASTNAME";
+                    break;
             }
         }
 

workflow/engine/methods/cases/ajaxListener.php

@@ -412,6 +412,7 @@ class Ajax
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/casesUploadedDocumentsPage', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/casesUploadedDocumentsPage'); //adding a html file  .html.
+        $oHeadPublisher->assign("FORMATS", $conf->getFormats());
         $oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));
         G::RenderPage('publish', 'extJs');
     }

workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php

@@ -81,6 +81,7 @@ if ($actionAjax == 'casesGenerateDocumentPage') {
     $conf = new Configurations();
     $oHeadPublisher->addExtJsScript( 'cases/casesGenerateDocumentPage', true ); //adding a javascript file .js
     $oHeadPublisher->addContent( 'cases/casesGenerateDocumentPage' ); //adding a html file  .html.
+    $oHeadPublisher->assign("FORMATS", $conf->getFormats());
     $oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
     G::RenderPage( 'publish', 'extJs' );
 }

workflow/engine/methods/cases/casesList_Ajax.php

@@ -58,12 +58,7 @@ if ($actionAjax == "userValues") {
 
             $conf = new Configurations();
 
-            $confEnvSetting = $conf->getConfiguration("ENVIRONMENT_SETTINGS", "");
-            $formatUserName = null;
-
-            if (is_array($confEnvSetting) && isset($confEnvSetting["format"])) {
-                $formatUserName = $confEnvSetting["format"];
-            }
+            $confEnvSetting = $conf->getFormats();
 
             $cUsers = new Criteria( 'workflow' );
             $cUsers->clearSelectColumns();
@@ -79,8 +74,7 @@ if ($actionAjax == "userValues") {
             while ($oDataset->next()) {
                 $row = $oDataset->getRow();
 
-                $usrFullName = $conf->usersNameFormatBySetParameters($formatUserName, $row["USR_USERNAME"], $row["USR_FIRSTNAME"], $row["USR_LASTNAME"]);
-                $usrFullName = (!empty($usrFullName))? $usrFullName : $row["USR_LASTNAME"] . " " . $row["USR_FIRSTNAME"];
+                $usrFullName = $conf->usersNameFormatBySetParameters($confEnvSetting["format"], $row["USR_USERNAME"], $row["USR_FIRSTNAME"], $row["USR_LASTNAME"]);
 
                 $users[] = array("USR_UID" => $row["USR_UID"], "USR_FULLNAME" => $usrFullName);
             }