Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r16247 -r16341 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 16247) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 16341) @@ -435,6 +435,7 @@ qmInstance.setTousseInstance(ti); qmInstance.setSterilizerName(ti.getSterilizerName()); qmInstance.setSterilizerFrequency(ti.getSterileFrequency()); + qmInstance.setTousseName(ti.getTousseDefinitionName()); } } String positionMsg = ""; Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r16263 -r16341 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 16263) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 16341) @@ -597,7 +597,11 @@ success : function(response,options){ var result = Ext.decode(response.responseText); if(result.success){ - top.Ext.getCmp('tousseName').setValue(result.tousseName); + if(tempBarcode != null && tempBarcode != ''){ + top.Ext.getCmp('tousseName').setValue(result.tousseName + "(" + tempBarcode + ")"); + }else{ + top.Ext.getCmp('tousseName').setValue(result.tousseName); + } top.Ext.getCmp('barcode').setValue(tempBarcode); top.Ext.getCmp('tousseInstanceId').setValue(result.tousseInstanceId); top.Ext.getCmp('tousseType').setValue(result.tousseType); @@ -1600,8 +1604,13 @@ top.Ext.getCmp('dateTime').setValue(Ext.util.Format.date(new Date(result.data.dateTime.time),"Y-m-d H:i")); top.Ext.getCmp('material').setValue(result.data.material); top.Ext.getCmp('amount').setValue(result.data.amount); - top.Ext.getCmp('tousseName').setValue(result.data.tousseName); top.Ext.getCmp('barcode').setValue(result.data.barcode); + var barcode = result.data.barcode; + if(barcode != null && barcode != ''){ + top.Ext.getCmp('tousseName').setValue(result.data.tousseName + "(" + barcode + ")"); + }else{ + top.Ext.getCmp('tousseName').setValue(result.data.tousseName); + } top.Ext.getCmp('scope').setValue(result.data.scope); top.Ext.getCmp('responsiblePerson').setValue(result.data.responsiblePerson); top.Ext.getCmp('createUserName').setValue(result.data.createUserName); Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js =================================================================== diff -u -r16300 -r16341 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 16300) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 16341) @@ -869,7 +869,12 @@ top.Ext.getCmp('dateTime2').setValue(Ext.util.Format.date(new Date(result.data.dateTime.time),"Y-m-d H:i")); top.Ext.getCmp('material2').setValue(result.data.material); top.Ext.getCmp('amount2').setValue(result.data.amount); - top.Ext.getCmp('tousseName2').setValue(result.data.tousseName); + var barcode = result.data.barcode; + if(barcode != null && barcode != ''){ + top.Ext.getCmp('tousseName2').setValue(result.data.tousseName + "(" + barcode + ")"); + }else{ + top.Ext.getCmp('tousseName2').setValue(result.data.tousseName); + } top.Ext.getCmp('barcode2').setValue(result.data.barcode); top.Ext.getCmp('scope').setValue(result.data.scope); top.Ext.getCmp('responsiblePerson2').setValue(result.data.responsiblePerson); @@ -1435,8 +1440,13 @@ top.Ext.getCmp('dateTime').setValue(Ext.util.Format.date(new Date(result.data.dateTime.time),"Y-m-d H:i")); top.Ext.getCmp('material').setValue(result.data.material); top.Ext.getCmp('amount').setValue(result.data.amount); - top.Ext.getCmp('tousseName').setValue(result.data.tousseName); - //top.Ext.getCmp('barcode').setValue(result.data.barcode); + var barcode = result.data.barcode; + if(barcode != null && barcode != ''){ + top.Ext.getCmp('tousseName').setValue(result.data.tousseName + "(" + barcode + ")"); + }else{ + top.Ext.getCmp('tousseName').setValue(result.data.tousseName); + } + top.Ext.getCmp('barcode').setValue(result.data.barcode); top.Ext.getCmp('scope').setValue(result.data.scope); top.Ext.getCmp('createUserName').setValue(result.data.createUserName); top.Ext.getCmp('reviewer').setValue(result.data.reviewer); @@ -1630,7 +1640,11 @@ var result = Ext.decode(response.responseText); if(result.success){ if(isQMView == true){ - top.Ext.getCmp('tousseName2').setValue(result.tousseName); + if(tempBarcode != null && tempBarcode != ''){ + top.Ext.getCmp('tousseName2').setValue(result.tousseName + "(" + tempBarcode + ")"); + }else{ + top.Ext.getCmp('tousseName2').setValue(result.tousseName); + } top.Ext.getCmp('barcode2').setValue(tempBarcode); top.Ext.getCmp('tousseInstanceId2').setValue(result.tousseInstanceId); if(result.tousseDefinitionId){ @@ -1642,7 +1656,11 @@ top.Ext.getCmp('tousseDefinitionId2').setValue(''); } }else{ - top.Ext.getCmp('tousseName').setValue(result.tousseName); + if(tempBarcode != null && tempBarcode != ''){ + top.Ext.getCmp('tousseName').setValue(result.tousseName + "(" + tempBarcode + ")"); + }else{ + top.Ext.getCmp('tousseName').setValue(result.tousseName); + } top.Ext.getCmp('barcode').setValue(tempBarcode); top.Ext.getCmp('tousseInstanceId').setValue(result.tousseInstanceId); top.Ext.getCmp('tousseType').setValue(result.tousseType);