Merged in bugfix/PMC-149 (pull request #6923)
PMC-149 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -696,3 +696,29 @@ function downloadFile(method, url, headers, formData, callBack) {
|
|||||||
xhr.send(formData);
|
xhr.send(formData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a valid date string to a date type object.
|
||||||
|
* @param {String} value
|
||||||
|
* @return {Date}
|
||||||
|
*/
|
||||||
|
function convertDate(value) {
|
||||||
|
var date,
|
||||||
|
array,
|
||||||
|
arrayDate,
|
||||||
|
arrayTime;
|
||||||
|
date = new Date(1900, 0, 1, 0, 0, 0);
|
||||||
|
try {
|
||||||
|
if (!Ext.isDate(value)) {
|
||||||
|
array = value.split(' ');
|
||||||
|
arrayDate = array[0].split('-');
|
||||||
|
if (array.length > 1) {
|
||||||
|
arrayTime = array[1].split(':');
|
||||||
|
} else {
|
||||||
|
arrayTime = new Array('0', '0', '0');
|
||||||
|
}
|
||||||
|
date = new Date(arrayDate[0], arrayDate[1] - 1, arrayDate[2], arrayTime[0], arrayTime[1], arrayTime[2]);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
}
|
||||||
|
return date;
|
||||||
|
}
|
||||||
@@ -438,6 +438,7 @@ class Ajax
|
|||||||
$oHeadPublisher->addExtJsScript('cases/caseHistory', true); //adding a javascript file .js
|
$oHeadPublisher->addExtJsScript('cases/caseHistory', true); //adding a javascript file .js
|
||||||
$oHeadPublisher->addContent('cases/caseHistory'); //adding a html file .html.
|
$oHeadPublisher->addContent('cases/caseHistory'); //adding a html file .html.
|
||||||
$oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));
|
$oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));
|
||||||
|
$oHeadPublisher->assign('FORMATS', $conf->getFormats());
|
||||||
G::RenderPage('publish', 'extJs');
|
G::RenderPage('publish', 'extJs');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -212,14 +212,21 @@
|
|||||||
)
|
)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
startDateRender = function(v){
|
* This applies the date format from the global configuration.
|
||||||
var dateString = "-";
|
* @param {String} value
|
||||||
if(v != "-" && v != null){
|
* @return {String}
|
||||||
dateString = _DF(v,"m/d/Y H:i:s");
|
*/
|
||||||
}
|
startDateRender = function (value) {
|
||||||
|
var dateString,
|
||||||
|
date;
|
||||||
|
dateString = "-";
|
||||||
|
if (value !== "-" && value !== null) {
|
||||||
|
date = convertDate(value);
|
||||||
|
dateString = date.dateFormat(FORMATS.casesListDateFormat);
|
||||||
|
}
|
||||||
return dateString;
|
return dateString;
|
||||||
}
|
}
|
||||||
|
|
||||||
actionRenderingTranslation = function(v){
|
actionRenderingTranslation = function(v){
|
||||||
var actionTranslate = "";
|
var actionTranslate = "";
|
||||||
|
|||||||
@@ -545,23 +545,6 @@ Ext.onReady ( function() {
|
|||||||
return String.format("<a href='#' onclick='unpauseCaseFunction(\"{0}\",\"{1}\")'>" + _('ID_UNPAUSE') + "</a>", r.data['APP_UID'], r.data['DEL_INDEX'] );
|
return String.format("<a href='#' onclick='unpauseCaseFunction(\"{0}\",\"{1}\")'>" + _('ID_UNPAUSE') + "</a>", r.data['APP_UID'], r.data['DEL_INDEX'] );
|
||||||
}
|
}
|
||||||
|
|
||||||
function convertDate ( value ) {
|
|
||||||
myDate = new Date( 1900,0,1,0,0,0);
|
|
||||||
try{
|
|
||||||
if(!Ext.isDate( value )){
|
|
||||||
var myArray = value.split(' ');
|
|
||||||
var myArrayDate = myArray[0].split('-');
|
|
||||||
if ( myArray.length > 1 )
|
|
||||||
var myArrayHour = myArray[1].split(':');
|
|
||||||
else
|
|
||||||
var myArrayHour = new Array('0','0','0');
|
|
||||||
var myDate = new Date( myArrayDate[0], myArrayDate[1]-1, myArrayDate[2], myArrayHour[0], myArrayHour[1], myArrayHour[2] );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch(e){};
|
|
||||||
|
|
||||||
return myDate;
|
|
||||||
}
|
|
||||||
function showDate (value,p,r) {
|
function showDate (value,p,r) {
|
||||||
var myDate = convertDate( value );
|
var myDate = convertDate( value );
|
||||||
return String.format("{0}", myDate.dateFormat( FORMATS.casesListDateFormat ));
|
return String.format("{0}", myDate.dateFormat( FORMATS.casesListDateFormat ));
|
||||||
|
|||||||
Reference in New Issue
Block a user