Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r12606 -r12966 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 12606) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 12966) @@ -306,11 +306,17 @@ } function compareDate(beginDate, endDate){ - var d1 = new Date(beginDate.replace(/-/g, "/")); - var d2 = new Date(endDate.replace(/-/g, "/")); - if( (d1 - d2) >0 ) - return false; - return true; + var d1 = beginDate; + if(!(beginDate instanceof Date)){ + d1 = new Date(beginDate.replace(/-/g, "/")); + } + var d2 = endDate; + if(!(endDate instanceof Date)){ + d2 = new Date(endDate.replace(/-/g, "/")); + } + if( (d1 - d2) >0 ) + return false; + return true; } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js =================================================================== diff -u -r12965 -r12966 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 12965) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 12966) @@ -910,8 +910,8 @@ var map = {}; map["code"] = Ext.getCmp('code').getValue(); map["batchNumber"] = Ext.getCmp('batchNumber').getValue(); - map["startDate"] = $Id('startDate').value; - map["endDate"] = $Id('endDate').value; + map["startDate"] = Ext.getCmp('startDate').getRawValue(); + map["endDate"] = Ext.getCmp('endDate').getRawValue(); map["type"] = entityName; commonEntry.onPrintEntryList(map,entityName); @@ -939,8 +939,8 @@ ); function initQueryValueAndReload() { - var startDate = $Id('startDate').value; - var endDate = $Id('endDate').value; + var startDate = Ext.getCmp('startDate').getRawValue(); + var endDate = Ext.getCmp('endDate').getRawValue(); var code = Ext.getCmp('code').getValue(); var batchNumber = Ext.getCmp('batchNumber').getValue(); if(startDate || endDate){ @@ -1090,9 +1090,9 @@ minWidth : 70, iconCls : 'icon_set', handler : function() { - $Id('code').value = ""; - $Id('startDate').value = ""; - $Id('endDate').value = ""; + Ext.getCmp('code').setValue(""); + Ext.getCmp('startDate').setValue(""); + Ext.getCmp('endDate').setValue(""); Ext.getCmp('batchNumber').setValue(""); } }] Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r12965 -r12966 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12965) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12966) @@ -1537,8 +1537,8 @@ var map = {}; map["code"] = Ext.getCmp('code').getValue(); map["batchNumber"] = Ext.getCmp('batchNumber').getValue(); - map["startDate"] = $Id('startDate').value; - map["endDate"] = $Id('endDate').value; + map["startDate"] = Ext.getCmp('startDate').getRawValue(); + map["endDate"] = Ext.getCmp('endDate').getRawValue(); map["type"] = entityName; commonEntry.onPrintEntryList(map,entityName); @@ -1573,8 +1573,8 @@ ); function initQueryValueAndReload() { - var startDate = $Id('startDate').value; - var endDate = $Id('endDate').value; + var startDate = Ext.getCmp('startDate').getRawValue(); + var endDate = Ext.getCmp('endDate').getRawValue(); var code = Ext.getCmp('code').getValue(); var batchNumber = Ext.getCmp('batchNumber').getValue(); if(startDate || endDate){ @@ -1724,9 +1724,9 @@ minWidth : 70, iconCls : 'icon_set', handler : function() { - $Id('code').value = ""; - $Id('startDate').value = ""; - $Id('endDate').value = ""; + Ext.getCmp('code').setValue(""); + Ext.getCmp('startDate').setValue(""); + Ext.getCmp('endDate').setValue(""); Ext.getCmp('batchNumber').setValue(""); } }]