BUG 0000 Add validation in case history with value null
- The function "startDateRender" don't validate null values
This commit is contained in:
@@ -1,35 +1,35 @@
|
|||||||
/*
|
/*
|
||||||
* @author: Douglas Medrano
|
* @author: Douglas Medrano
|
||||||
* May 03, 2011
|
* May 03, 2011
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onResizeIframe(idIframe){
|
function onResizeIframe(idIframe){
|
||||||
window.parent.tabIframeWidthFix2(idIframe);
|
window.parent.tabIframeWidthFix2(idIframe);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ajaxPostRequest(url, callback_function, id){
|
function ajaxPostRequest(url, callback_function, id){
|
||||||
var d = new Date();
|
var d = new Date();
|
||||||
var time = d.getTime();
|
var time = d.getTime();
|
||||||
url= url + '&nocachetime='+time;
|
url= url + '&nocachetime='+time;
|
||||||
var return_xml=false;
|
var return_xml=false;
|
||||||
var http_request = false;
|
var http_request = false;
|
||||||
|
|
||||||
if (window.XMLHttpRequest){ // Mozilla, Safari,...
|
if (window.XMLHttpRequest){ // Mozilla, Safari,...
|
||||||
http_request = new XMLHttpRequest();
|
http_request = new XMLHttpRequest();
|
||||||
if (http_request.overrideMimeType){
|
if (http_request.overrideMimeType){
|
||||||
http_request.overrideMimeType('text/xml');
|
http_request.overrideMimeType('text/xml');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (window.ActiveXObject){// IE
|
else if (window.ActiveXObject){// IE
|
||||||
try{
|
try{
|
||||||
http_request = new ActiveXObject("Msxml2.XMLHTTP");
|
http_request = new ActiveXObject("Msxml2.XMLHTTP");
|
||||||
}
|
}
|
||||||
catch (e){
|
catch (e){
|
||||||
try{
|
try{
|
||||||
http_request = new ActiveXObject("Microsoft.XMLHTTP");
|
http_request = new ActiveXObject("Microsoft.XMLHTTP");
|
||||||
}
|
}
|
||||||
catch (e){
|
catch (e){
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -37,17 +37,17 @@
|
|||||||
alert('This browser is not supported.');
|
alert('This browser is not supported.');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
http_request.onreadystatechange = function(){
|
http_request.onreadystatechange = function(){
|
||||||
if (http_request.readyState == 4){
|
if (http_request.readyState == 4){
|
||||||
if (http_request.status == 200){
|
if (http_request.status == 200){
|
||||||
if (return_xml){
|
if (return_xml){
|
||||||
eval(callback_function + '(http_request.responseXML)');
|
eval(callback_function + '(http_request.responseXML)');
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
eval(callback_function + '(http_request.responseText, \''+id+'\')');
|
eval(callback_function + '(http_request.responseText, \''+id+'\')');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
alert('Error found on request:(Code: ' + http_request.status + ')');
|
alert('Error found on request:(Code: ' + http_request.status + ')');
|
||||||
}
|
}
|
||||||
@@ -55,8 +55,8 @@
|
|||||||
}
|
}
|
||||||
http_request.open('GET', url, true);
|
http_request.open('GET', url, true);
|
||||||
http_request.send(null);
|
http_request.send(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
var processesGrid;
|
var processesGrid;
|
||||||
var store;
|
var store;
|
||||||
|
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
table.style.display = '';
|
table.style.display = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
new Ext.KeyMap(
|
new Ext.KeyMap(
|
||||||
document,
|
document,
|
||||||
{
|
{
|
||||||
@@ -91,31 +91,31 @@
|
|||||||
Ext.onReady(function(){
|
Ext.onReady(function(){
|
||||||
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
|
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
|
||||||
Ext.QuickTips.init();
|
Ext.QuickTips.init();
|
||||||
|
|
||||||
historyGridList();
|
historyGridList();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
//!historyGridList|
|
//!historyGridList|
|
||||||
//!!historyGridList|changeLog
|
//!!historyGridList|changeLog
|
||||||
function historyGridListChangeLogPanelBody_RSP(resp,id){
|
function historyGridListChangeLogPanelBody_RSP(resp,id){
|
||||||
var historyGridListChangeLogPanel_id_ = Ext.getCmp('historyGridListChangeLogPanel_id');
|
var historyGridListChangeLogPanel_id_ = Ext.getCmp('historyGridListChangeLogPanel_id');
|
||||||
historyGridListChangeLogPanel_id_.show();
|
historyGridListChangeLogPanel_id_.show();
|
||||||
var historyGridListChangeLogPanelBody_= document.getElementById('historyGridListChangeLogPanelBody_JXP');
|
var historyGridListChangeLogPanelBody_= document.getElementById('historyGridListChangeLogPanelBody_JXP');
|
||||||
historyGridListChangeLogPanelBody_.innerHTML= resp;
|
historyGridListChangeLogPanelBody_.innerHTML= resp;
|
||||||
}
|
}
|
||||||
|
|
||||||
function historyGridListChangeLogPanelBody_JXP(){
|
function historyGridListChangeLogPanelBody_JXP(){
|
||||||
//!historyGridListChangeLogGlobal
|
//!historyGridListChangeLogGlobal
|
||||||
historyGridListChangeLogGlobal.idHistory = historyGridListChangeLogGlobal.idHistory;
|
historyGridListChangeLogGlobal.idHistory = historyGridListChangeLogGlobal.idHistory;
|
||||||
|
|
||||||
//dataSystem
|
//dataSystem
|
||||||
var idHistory = historyGridListChangeLogGlobal.idHistory;
|
var idHistory = historyGridListChangeLogGlobal.idHistory;
|
||||||
|
|
||||||
var url = "caseHistory_Ajax.php?actionAjax=historyGridListChangeLogPanelBody_JXP&idHistory="+idHistory;
|
var url = "caseHistory_Ajax.php?actionAjax=historyGridListChangeLogPanelBody_JXP&idHistory="+idHistory;
|
||||||
ajaxPostRequest(url,'historyGridListChangeLogPanelBody_RSP');
|
ajaxPostRequest(url,'historyGridListChangeLogPanelBody_RSP');
|
||||||
}
|
}
|
||||||
|
|
||||||
function historyGridListChangeLogPanel(){
|
function historyGridListChangeLogPanel(){
|
||||||
var w = new Ext.Window({
|
var w = new Ext.Window({
|
||||||
//draggable: Ext.util.Draggable,
|
//draggable: Ext.util.Draggable,
|
||||||
@@ -136,23 +136,23 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
name:'ajaxAction',
|
name:'ajaxAction',
|
||||||
xtype:'hidden',
|
xtype:'hidden',
|
||||||
value:'uploadFileNewProcess'
|
value:'uploadFileNewProcess'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
historyGridListChangeLogPanelBody_JXP();
|
historyGridListChangeLogPanelBody_JXP();
|
||||||
}
|
}
|
||||||
|
|
||||||
var historyGridListChangeLogGlobal = {};
|
var historyGridListChangeLogGlobal = {};
|
||||||
historyGridListChangeLogGlobal.idHistory ='';
|
historyGridListChangeLogGlobal.idHistory ='';
|
||||||
|
|
||||||
function historyGridListChangeLog(){
|
function historyGridListChangeLog(){
|
||||||
|
|
||||||
historyGridListChangeLogGlobal.idHistory = historyGridListChangeLogGlobal.idHistory;
|
historyGridListChangeLogGlobal.idHistory = historyGridListChangeLogGlobal.idHistory;
|
||||||
var rowSelected = processesGrid.getSelectionModel().getSelected();
|
var rowSelected = processesGrid.getSelectionModel().getSelected();
|
||||||
if( rowSelected ){
|
if( rowSelected ){
|
||||||
var idHistory = rowSelected.data.ID_HISTORY;
|
var idHistory = rowSelected.data.ID_HISTORY;
|
||||||
historyGridListChangeLogGlobal.idHistory = idHistory;
|
historyGridListChangeLogGlobal.idHistory = idHistory;
|
||||||
historyGridListChangeLogPanel();
|
historyGridListChangeLogPanel();
|
||||||
}
|
}
|
||||||
@@ -167,10 +167,10 @@
|
|||||||
buttons: Ext.MessageBox.OK
|
buttons: Ext.MessageBox.OK
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//!!historyGridList|changeLog
|
//!!historyGridList|changeLog
|
||||||
|
|
||||||
function historyGridList(){
|
function historyGridList(){
|
||||||
store = new Ext.data.GroupingStore({
|
store = new Ext.data.GroupingStore({
|
||||||
proxy : new Ext.data.HttpProxy
|
proxy : new Ext.data.HttpProxy
|
||||||
@@ -178,8 +178,8 @@
|
|||||||
{
|
{
|
||||||
url: 'caseHistory_Ajax.php?actionAjax=historyGridList_JXP'
|
url: 'caseHistory_Ajax.php?actionAjax=historyGridList_JXP'
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
|
|
||||||
reader : new Ext.data.JsonReader
|
reader : new Ext.data.JsonReader
|
||||||
(
|
(
|
||||||
{
|
{
|
||||||
@@ -203,24 +203,24 @@
|
|||||||
{name : 'APP_DISABLE_ACTION_DATE', type:'float'}
|
{name : 'APP_DISABLE_ACTION_DATE', type:'float'}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
});
|
});
|
||||||
|
|
||||||
var expander = new Ext.ux.grid.RowExpander({
|
var expander = new Ext.ux.grid.RowExpander({
|
||||||
tpl : new Ext.Template(
|
tpl : new Ext.Template(
|
||||||
'<p><b>'+TRANSLATIONS.ID_PRO_DESCRIPTION+':</b> {PRO_DESCRIPTION}</p><br>'
|
'<p><b>'+TRANSLATIONS.ID_PRO_DESCRIPTION+':</b> {PRO_DESCRIPTION}</p><br>'
|
||||||
)
|
)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
startDateRender = function(v){
|
startDateRender = function(v){
|
||||||
var dateString = "-";
|
var dateString = "-";
|
||||||
if(v!="-"){
|
if(v != "-" && v != null){
|
||||||
dateString = _DF(v,"m/d/Y H:i:s");
|
dateString = _DF(v,"m/d/Y H:i:s");
|
||||||
}
|
}
|
||||||
return dateString;
|
return dateString;
|
||||||
}
|
}
|
||||||
|
|
||||||
actionRenderingTranslation = function(v){
|
actionRenderingTranslation = function(v){
|
||||||
var actionTranslate = "";
|
var actionTranslate = "";
|
||||||
if(v=="PAUSE"){
|
if(v=="PAUSE"){
|
||||||
@@ -237,11 +237,11 @@
|
|||||||
}
|
}
|
||||||
else if(v==""||v==null){
|
else if(v==""||v==null){
|
||||||
actionTranslate = _("ID_DERIVATED");
|
actionTranslate = _("ID_DERIVATED");
|
||||||
}
|
}
|
||||||
return actionTranslate;
|
return actionTranslate;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
processesGrid = new Ext.grid.GridPanel({
|
processesGrid = new Ext.grid.GridPanel({
|
||||||
region: 'center',
|
region: 'center',
|
||||||
layout: 'fit',
|
layout: 'fit',
|
||||||
@@ -257,15 +257,15 @@
|
|||||||
frame:false,
|
frame:false,
|
||||||
//plugins: expander,
|
//plugins: expander,
|
||||||
cls : 'grid_with_checkbox',
|
cls : 'grid_with_checkbox',
|
||||||
columnLines: true,
|
columnLines: true,
|
||||||
viewConfig: {
|
viewConfig: {
|
||||||
forceFit:true
|
forceFit:true
|
||||||
},
|
},
|
||||||
cm: new Ext.grid.ColumnModel({
|
cm: new Ext.grid.ColumnModel({
|
||||||
defaults: {
|
defaults: {
|
||||||
width: 200,
|
width: 200,
|
||||||
sortable: true
|
sortable: true
|
||||||
},
|
},
|
||||||
columns: [
|
columns: [
|
||||||
//expander,
|
//expander,
|
||||||
{id:'ID_HISTORY', dataIndex: 'ID_HISTORY', hidden:true, hideable:false},
|
{id:'ID_HISTORY', dataIndex: 'ID_HISTORY', hidden:true, hideable:false},
|
||||||
@@ -277,7 +277,7 @@
|
|||||||
return String.format("<font color='{0}'>{1}</font>", color, v);
|
return String.format("<font color='{0}'>{1}</font>", color, v);
|
||||||
}},*/
|
}},*/
|
||||||
{header: _("ID_TASK_TRANSFER"), dataIndex: 'DEL_DELEGATE_DATE', width: 60, renderer:startDateRender},
|
{header: _("ID_TASK_TRANSFER"), dataIndex: 'DEL_DELEGATE_DATE', width: 60, renderer:startDateRender},
|
||||||
{header: _("ID_START_DATE"), dataIndex: 'DEL_INIT_DATE', width: 60, renderer: startDateRender},
|
{header: _("ID_START_DATE"), dataIndex: 'DEL_INIT_DATE', width: 60, renderer: startDateRender},
|
||||||
{header: _("ID_END_DATE"), dataIndex: 'DEL_FINISH_DATE', width: 60, renderer:startDateRender},
|
{header: _("ID_END_DATE"), dataIndex: 'DEL_FINISH_DATE', width: 60, renderer:startDateRender},
|
||||||
{header: _("ID_ACTION"), dataIndex: 'APP_TYPE', width: 50, renderer: actionRenderingTranslation},
|
{header: _("ID_ACTION"), dataIndex: 'APP_TYPE', width: 50, renderer: actionRenderingTranslation},
|
||||||
{header: _("ID_ENABLE_ACTION"), dataIndex: 'APP_ENABLE_ACTION_DATE', width: 70, renderer:startDateRender},
|
{header: _("ID_ENABLE_ACTION"), dataIndex: 'APP_ENABLE_ACTION_DATE', width: 70, renderer:startDateRender},
|
||||||
@@ -295,11 +295,11 @@
|
|||||||
icon: '/images/ext/gray/shapes/hourglass.png',
|
icon: '/images/ext/gray/shapes/hourglass.png',
|
||||||
handler: function(){
|
handler: function(){
|
||||||
var rowSelected = processesGrid.getSelectionModel().getSelected();
|
var rowSelected = processesGrid.getSelectionModel().getSelected();
|
||||||
|
|
||||||
if( rowSelected ){
|
if( rowSelected ){
|
||||||
window.parent.historyGridListChangeLogGlobal.idHistory = rowSelected.data.ID_HISTORY;
|
window.parent.historyGridListChangeLogGlobal.idHistory = rowSelected.data.ID_HISTORY;
|
||||||
window.parent.historyGridListChangeLogGlobal.tasTitle = rowSelected.data.TAS_TITLE;
|
window.parent.historyGridListChangeLogGlobal.tasTitle = rowSelected.data.TAS_TITLE;
|
||||||
|
|
||||||
var idHistory = window.parent.historyGridListChangeLogGlobal.idHistory;
|
var idHistory = window.parent.historyGridListChangeLogGlobal.idHistory;
|
||||||
window.parent.Actions.tabFrame('changeLogTab'+idHistory);
|
window.parent.Actions.tabFrame('changeLogTab'+idHistory);
|
||||||
}
|
}
|
||||||
@@ -312,10 +312,10 @@
|
|||||||
animEl: 'elId',
|
animEl: 'elId',
|
||||||
icon: Ext.MessageBox.INFO,
|
icon: Ext.MessageBox.INFO,
|
||||||
buttons: Ext.MessageBox.OK
|
buttons: Ext.MessageBox.OK
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
disabled:false
|
disabled:false
|
||||||
},
|
},
|
||||||
@@ -335,16 +335,16 @@
|
|||||||
rowdblclick: emptyReturn,
|
rowdblclick: emptyReturn,
|
||||||
render: function(){
|
render: function(){
|
||||||
this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'});
|
this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'});
|
||||||
processesGrid.getSelectionModel().on('rowselect', function(){
|
processesGrid.getSelectionModel().on('rowselect', function(){
|
||||||
var rowSelected = processesGrid.getSelectionModel().getSelected();
|
var rowSelected = processesGrid.getSelectionModel().getSelected();
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
processesGrid.store.load({params: {"function":"languagesList"}});
|
processesGrid.store.load({params: {"function":"languagesList"}});
|
||||||
|
|
||||||
processesGrid.store.on(
|
processesGrid.store.on(
|
||||||
'load',
|
'load',
|
||||||
function()
|
function()
|
||||||
@@ -356,16 +356,16 @@
|
|||||||
single: true
|
single: true
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
processesGrid.addListener('rowcontextmenu', emptyReturn,this);
|
processesGrid.addListener('rowcontextmenu', emptyReturn,this);
|
||||||
processesGrid.on('rowcontextmenu', function (grid, rowIndex, evt) {
|
processesGrid.on('rowcontextmenu', function (grid, rowIndex, evt) {
|
||||||
var sm = grid.getSelectionModel();
|
var sm = grid.getSelectionModel();
|
||||||
sm.selectRow(rowIndex, sm.isSelected(rowIndex));
|
sm.selectRow(rowIndex, sm.isSelected(rowIndex));
|
||||||
|
|
||||||
var rowSelected = Ext.getCmp('processesGrid').getSelectionModel().getSelected();
|
var rowSelected = Ext.getCmp('processesGrid').getSelectionModel().getSelected();
|
||||||
var activator = Ext.getCmp('activator2');
|
var activator = Ext.getCmp('activator2');
|
||||||
var debug = Ext.getCmp('debug');
|
var debug = Ext.getCmp('debug');
|
||||||
|
|
||||||
if( rowSelected.data.PRO_STATUS == 'ACTIVE' ){
|
if( rowSelected.data.PRO_STATUS == 'ACTIVE' ){
|
||||||
activator.setIconClass('icon-deactivate');
|
activator.setIconClass('icon-deactivate');
|
||||||
activator.setText(TRANSLATIONS.ID_DEACTIVATE);
|
activator.setText(TRANSLATIONS.ID_DEACTIVATE);
|
||||||
@@ -373,7 +373,7 @@
|
|||||||
activator.setIconClass('icon-activate');
|
activator.setIconClass('icon-activate');
|
||||||
activator.setText(TRANSLATIONS.ID_ACTIVATE);
|
activator.setText(TRANSLATIONS.ID_ACTIVATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if( rowSelected.data.PRO_DEBUG == 1){
|
if( rowSelected.data.PRO_DEBUG == 1){
|
||||||
debug.setIconClass('icon-debug-disabled');
|
debug.setIconClass('icon-debug-disabled');
|
||||||
debug.setText(_('ID_DISABLE_DEBUG'));
|
debug.setText(_('ID_DISABLE_DEBUG'));
|
||||||
@@ -382,22 +382,22 @@
|
|||||||
debug.setText(_('ID_ENABLE_DEBUG'));
|
debug.setText(_('ID_ENABLE_DEBUG'));
|
||||||
}
|
}
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
processesGrid.on('contextmenu', function (evt) {
|
processesGrid.on('contextmenu', function (evt) {
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function emptyReturn(){
|
function emptyReturn(){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var viewport = new Ext.Viewport({
|
var viewport = new Ext.Viewport({
|
||||||
layout: 'border',
|
layout: 'border',
|
||||||
autoScroll: true,
|
autoScroll: true,
|
||||||
@@ -407,6 +407,6 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
//!historyGridList|
|
//!historyGridList|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user