update FeeRate

web/building_saas/main/js/models/fee_rate.js

@@ -254,7 +254,7 @@ var FeeRate = {
                 if(editInfo.calcItem.feeRateID){
                     var rate = projectObj.project.FeeRate.getFeeRateByID(editInfo.calcItem.feeRateID);
                     if(rate!=undefined){
-                        this.updateFeeRateByCalc(rate,value,editInfo);
+                        this.updateFeeRateByCalc(rate,value);
                         return;
                     }
                 }
@@ -262,14 +262,14 @@ var FeeRate = {
                 editInfo.calcItem.feeRateID=null;
                 var data={'projectID': projectObj.project.ID(),'templatesID': editInfo.template.ID,'calcItem': editInfo.calcItem};
                 rationPM.saveCalcItem(data,function (result) {
+                    project.calcProgram.compileAllTemps();
                     rationPM.refreshDetailSheet();
                 })
-                //updateCal
             }else {
                 rationPM.refreshDetailSheet();
             }
         };
-        FeeRate.prototype.updateFeeRateByCalc=function (rate,value,editInfo) {
+        FeeRate.prototype.updateFeeRateByCalc=function (rate,value) {
             var me=this;
             var data={
                 query:{
@@ -281,12 +281,15 @@ var FeeRate = {
                 }
             }
             CommonAjax.post('/feeRates/updateFeeRate', data, function (data) {
-                _.forEach(editInfo.template.calcItems,function (item) {
-                    if(item.feeRateID==rate.ID){
-                        item.feeRate = value;
-                    }
-                })
+                for(var i =0;i<rationPM.datas.length;i++){
+                    _.forEach(rationPM.datas[i].calcItems,function (item) {
+                        if(item.feeRateID==rate.ID){
+                            item.feeRate = value;
+                        }
+                    })
+                }
                 rate.rate=value;
+                project.calcProgram.compileAllTemps();
                 rationPM.refreshDetailSheet();
                 socket.emit('feeRateChangeNotify', me.getActivateFeeRateFileID());
             });
@@ -419,10 +422,6 @@ var FeeRate = {
 
         };
 
-        FeeRate.prototype.getRate = function (fileID, rateID){
-            return 1.25;
-        };
-
         var feeRate = new FeeRate(project);
         return feeRate;
     },

web/building_saas/main/js/views/fee_rate_view.js

@@ -648,6 +648,7 @@ var feeRateObject={
         var data={'projectID': projectObj.project.ID(),'templatesID': calInfo.template.ID,'calcItem': calInfo.calcItem};
         rationPM.saveCalcItem(data,function (result) {
             calInfo.calcItem.feeRate=rate.rate;
+            project.calcProgram.compileAllTemps();
             rationPM.refreshDetailSheet();
             $("#fee_rate_tree").modal('hide');
         });