Skip to content

Commit

Permalink
Fixed issue #6433: Wrong date/time is showing in survey summary
Browse files Browse the repository at this point in the history 
Dev This should also fix most other date conversion related issues
  • Loading branch information
@c-schmitz
c-schmitz committed Aug 7, 2012
1 parent 0a601a9 commit 5146de5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
9 changes: 3 additions & 6 deletions application/controllers/admin/surveyadmin.php
View file
Expand Up @@ -628,7 +628,7 @@ public function getSurveys_json()

//Set Date
Yii::import('application.libraries.Date_Time_Converter', true);
$datetimeobj = new Date_Time_Converter(array($rows['datecreated'], "Y-m-d H:i:s"));
$datetimeobj = new Date_Time_Converter($rows['datecreated'], "Y-m-d H:i:s");
$aSurveyEntry[] = '<!--' . $rows['datecreated'] . '-->' . $datetimeobj->convert($dateformatdetails['phpdate']);

//Set Owner
Expand Down Expand Up @@ -1228,19 +1228,16 @@ private function _tabPublicationAccess($esrow)
$startdate = '';
if ($esrow['startdate'])
{
$items = array($esrow["startdate"], "Y-m-d H:i:s"); // $dateformatdetails['phpdate']
Yii::app()->loadLibrary('Date_Time_Converter');
$datetimeobj = new date_time_converter($items); //new Date_Time_Converter($esrow['startdate'] , "Y-m-d H:i:s");
$datetimeobj = new date_time_converter($esrow["startdate"],"Y-m-d H:i:s"); //new Date_Time_Converter($esrow['startdate'] , "Y-m-d H:i:s");
$startdate = $datetimeobj->convert("d.m.Y H:i"); //$datetimeobj->convert($dateformatdetails['phpdate'].' H:i');
}

$expires = '';
if ($esrow['expires'])
{
$items = array($esrow['expires'], "Y-m-d H:i:s");

Yii::app()->loadLibrary('Date_Time_Converter');
$datetimeobj = new date_time_converter($items); //new Date_Time_Converter($esrow['expires'] , "Y-m-d H:i:s");
$datetimeobj = new date_time_converter($esrow['expires'], "Y-m-d H:i:s"); //new Date_Time_Converter($esrow['expires'] , "Y-m-d H:i:s");
$expires = $datetimeobj->convert("d.m.Y H:i");
}
$aData['clang'] = $clang;
Expand Down
12 changes: 6 additions & 6 deletions application/controllers/admin/tokens.php
View file
Expand Up @@ -690,7 +690,7 @@ function addnew($iSurveyId)
}
else
{
$datetimeobj = new Date_Time_Converter(array(trim(Yii::app()->request->getPost('validfrom')), $dateformatdetails['phpdate'] . ' H:i'));
$datetimeobj = new Date_Time_Converter(trim(Yii::app()->request->getPost('validfrom')), $dateformatdetails['phpdate'] . ' H:i');
$validfrom = $datetimeobj->convert('Y-m-d H:i:s');
}
if (trim(Yii::app()->request->getPost('validuntil')) == '')
Expand All @@ -699,7 +699,7 @@ function addnew($iSurveyId)
}
else
{
$datetimeobj = new Date_Time_Converter(array(trim(Yii::app()->request->getPost('validuntil')), $dateformatdetails['phpdate'] . ' H:i'));
$datetimeobj = new Date_Time_Converter(trim(Yii::app()->request->getPost('validuntil')), $dateformatdetails['phpdate'] . ' H:i');
$validuntil = $datetimeobj->convert('Y-m-d H:i:s');
}

Expand Down Expand Up @@ -810,7 +810,7 @@ function edit($iSurveyId, $iTokenId)
}
else
{
$datetimeobj = new Date_Time_Converter(array(trim(Yii::app()->request->getPost('validfrom')), $dateformatdetails['phpdate'] . ' H:i'));
$datetimeobj = new Date_Time_Converter(trim(Yii::app()->request->getPost('validfrom')), $dateformatdetails['phpdate'] . ' H:i');
$_POST['validfrom'] = $datetimeobj->convert('Y-m-d H:i:s');
}
if (trim(Yii::app()->request->getPost('validuntil')) == '')
Expand All @@ -819,7 +819,7 @@ function edit($iSurveyId, $iTokenId)
}
else
{
$datetimeobj = new Date_Time_Converter(array(trim(Yii::app()->request->getPost('validuntil')), $dateformatdetails['phpdate'] . ' H:i'));
$datetimeobj = new Date_Time_Converter(trim(Yii::app()->request->getPost('validuntil')), $dateformatdetails['phpdate'] . ' H:i');
$_POST['validuntil'] = $datetimeobj->convert('Y-m-d H:i:s');
}

Expand Down Expand Up @@ -946,7 +946,7 @@ function addDummies($iSurveyId, $subaction = '')
}
else
{
$datetimeobj = new Date_Time_Converter(array(trim(Yii::app()->request->getPost('validfrom')), $dateformatdetails['phpdate'] . ' H:i'));
$datetimeobj = new Date_Time_Converter(trim(Yii::app()->request->getPost('validfrom')), $dateformatdetails['phpdate'] . ' H:i');
$_POST['validfrom'] = $datetimeobj->convert('Y-m-d H:i:s');
}
if (trim(Yii::app()->request->getPost('validuntil')) == '')
Expand All @@ -955,7 +955,7 @@ function addDummies($iSurveyId, $subaction = '')
}
else
{
$datetimeobj = new Date_Time_Converter(array(trim(Yii::app()->request->getPost('validuntil')), $dateformatdetails['phpdate'] . ' H:i'));
$datetimeobj = new Date_Time_Converter(trim(Yii::app()->request->getPost('validuntil')), $dateformatdetails['phpdate'] . ' H:i');
$_POST['validuntil'] = $datetimeobj->convert('Y-m-d H:i:s');
}

Expand Down
2 changes: 1 addition & 1 deletion application/helpers/common_helper.php
View file
Expand Up @@ -5571,7 +5571,7 @@ function useFirebug()
function convertDateTimeFormat($value, $fromdateformat, $todateformat)
{
Yii::import('application.libraries.Date_Time_Converter', true);
$date = new Date_Time_Converter(array($value, $fromdateformat));
$date = new Date_Time_Converter($value, $fromdateformat);
return $date->convert($todateformat);
}

Expand Down
3 changes: 1 addition & 2 deletions application/helpers/replacements_helper.php
View file
Expand Up @@ -371,9 +371,8 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
if (isset($thissurvey['expiry']))
{
$dateformatdetails=getDateFormatData($thissurvey['surveyls_dateformat']);
$items = array($thissurvey['expiry'],"Y-m-d");
Yii::import('application.libraries.Date_Time_Converter', true);
$datetimeobj = new Date_Time_Converter($items) ;
$datetimeobj = new Date_Time_Converter($thissurvey['expiry'],"Y-m-d") ;
$_dateoutput=$datetimeobj->convert($dateformatdetails['phpdate']);
}
else
Expand Down

0 comments on commit 5146de5

Please sign in to comment.